Skip to content

Commit 618b867

Browse files
stalkergstalkerg
committed
Merge branch 'PGPRO9_5' into PGPRO9_5_ptrack
2 parents 6596c9d + dda4a37 commit 618b867

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+847
-174
lines changed

‎configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2745,7 +2745,7 @@ fi
27452745

27462746

27472747

2748-
PGPRO_VERSION="$PACKAGE_VERSION.1"
2748+
PGPRO_VERSION="$PACKAGE_VERSION.2"
27492749
PGPRO_PACKAGE_NAME="PostgresPro"
27502750

27512751

‎configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
3838
[PG_VERSION="$PACKAGE_VERSION$withval"],
3939
[PG_VERSION="$PACKAGE_VERSION"])
4040

41-
PGPRO_VERSION="$PACKAGE_VERSION.1"
41+
PGPRO_VERSION="$PACKAGE_VERSION.2"
4242
PGPRO_PACKAGE_NAME="PostgresPro"
4343
AC_SUBST(PGPRO_PACKAGE_NAME)
4444

‎contrib/btree_gist/expected/not_equal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ INSERT INTO test_ne SELECT '2009-01-01', 10.7 FROM generate_series(1,1000);
99
INSERT INTO test_ne VALUES('2007-02-03', -91.3);
1010
INSERT INTO test_ne VALUES('2011-09-01', 43.7);
1111
INSERT INTO test_ne SELECT '2009-01-01', 10.7 FROM generate_series(1,1000);
12+
SET enable_indexscan to false;
1213
EXPLAIN (COSTS OFF) SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
1314
QUERY PLAN
1415
------------------------------------------------------------------------------------------------------
@@ -25,6 +26,7 @@ SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
2526
Thu Sep 01 00:00:00 2011 | 43.7
2627
(2 rows)
2728

29+
RESET enable_indexscan;
2830
-- test search for "not equals" using an exclusion constraint
2931
CREATE TABLE zoo (
3032
cage INTEGER,

‎contrib/btree_gist/sql/not_equal.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@ INSERT INTO test_ne VALUES('2007-02-03', -91.3);
1414
INSERT INTO test_ne VALUES('2011-09-01', 43.7);
1515
INSERT INTO test_ne SELECT '2009-01-01', 10.7 FROM generate_series(1,1000);
1616

17+
SET enable_indexscan to false;
18+
1719
EXPLAIN (COSTS OFF) SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
1820

1921
SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
2022

23+
RESET enable_indexscan;
24+
2125
-- test search for "not equals" using an exclusion constraint
2226

2327
CREATE TABLE zoo (

‎doc/src/sgml/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ ifndef XSLTPROC
5454
XSLTPROC = $(missing) xsltproc
5555
endif
5656

57-
override XSLTPROCFLAGS += --stringparam pg.version '$(VERSION)'
57+
override XSLTPROCFLAGS += --stringparam pg.version '$(PGPRO_VERSION)'
5858

5959

6060
GENERATED_SGML = bookindex.sgml version.sgml \
@@ -147,7 +147,7 @@ endif
147147
# changes.
148148
version.sgml: $(top_srcdir)/configure
149149
{ \
150-
echo "<!ENTITY version \"$(VERSION)\">"; \
150+
echo "<!ENTITY version \"$(PGPRO_VERSION)\">"; \
151151
echo "<!ENTITY majorversion \"$(MAJORVERSION)\">"; \
152152
echo "<!ENTITY productname \"$(PRODUCT_NAME)\">"; \
153153
} > $@

‎doc/src/sgml/contrib.sgml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ CREATE EXTENSION <replaceable>module_name</> FROM unpackaged;
130130
&pgbuffercache;
131131
&pgcrypto;
132132
&pgfreespacemap;
133+
&pgpathman;
133134
&pgprewarm;
134135
&pgrowlocks;
135136
&pgstatstatements;

‎doc/src/sgml/filelist.sgml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
<!ENTITY pgbuffercache SYSTEM "pgbuffercache.sgml">
134134
<!ENTITY pgcrypto SYSTEM "pgcrypto.sgml">
135135
<!ENTITY pgfreespacemap SYSTEM "pgfreespacemap.sgml">
136+
<!ENTITY pgpathman SYSTEM "pgpathman.sgml">
136137
<!ENTITY pgprewarm SYSTEM "pgprewarm.sgml">
137138
<!ENTITY pgrowlocks SYSTEM "pgrowlocks.sgml">
138139
<!ENTITY pgstandby SYSTEM "pgstandby.sgml">

‎doc/src/sgml/func.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@
350350
expression that contains both NULL and non-null values will return false
351351
for both tests.
352352
This definition conforms to the SQL standard, and is a change from the
353-
inconsistent behavior exhibited by <productname>&productname;</productname>
353+
inconsistent behavior exhibited by <productname>PostgreSQL</productname>
354354
versions prior to 8.2.
355355
</para>
356356
</note>
@@ -14452,7 +14452,7 @@ AND
1445214452

1445314453
<note>
1445414454
<para>
14455-
Prior to <productname>PosgreSQL</productname> 8.2, the
14455+
Prior to <productname>PostgreSQL</productname> 8.2, the
1445614456
<literal>&lt;</>, <literal>&lt;=</>, <literal>&gt;</> and <literal>&gt;=</>
1445714457
cases were not handled per SQL specification. A comparison like
1445814458
<literal>ROW(a,b) &lt; ROW(c,d)</>
@@ -14961,7 +14961,7 @@ SELECT * FROM pg_ls_dir('.') WITH ORDINALITY AS t(ls,n);
1496114961
<row>
1496214962
<entry><literal><function>version()</function></literal></entry>
1496314963
<entry><type>text</type></entry>
14964-
<entry>PostgreSQL version information. See also <xref linkend="guc-server-version-num"> for a machine-readable version.</entry>
14964+
<entry><productname>PostgreSQL</productname> version information. See also <xref linkend="guc-server-version-num"> for a machine-readable version.</entry>
1496514965
</row>
1496614966

1496714967
<row>

‎doc/src/sgml/gin.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@
539539
<function>extractQuery</> to pass additional data to the
540540
<function>consistent</> and <function>comparePartial</> methods.
541541
To use it, <function>extractQuery</> must allocate
542-
an array of <literal>*nkeys</> Pointers and store its address at
542+
an array of <literal>*nkeys</> pointers and store its address at
543543
<literal>*extra_data</>, then store whatever it wants to into the
544544
individual pointers. The variable is initialized to <symbol>NULL</symbol> before
545545
call, so this argument can simply be ignored by operator classes that

‎doc/src/sgml/install-windows.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
for Windows Desktop</productname> or those in the <productname>Windows SDK
8282
7.1</productname>, which are both free downloads from Microsoft.
8383
</para>
84-
<para>>
84+
<para>
8585
Both 32-bit and 64-bit builds are possible with the Microsoft Compiler suite.
8686
32-bit <productname>&productname;</productname> builds are possible with
8787
<productname>Visual Studio 2005</productname> to
@@ -441,7 +441,7 @@ $ENV{CONFIG}="Debug";
441441
<userinput>vcregress modulescheck</userinput>
442442
<userinput>vcregress ecpgcheck</userinput>
443443
<userinput>vcregress isolationcheck</userinput>
444-
<userinput>vcregress tapcheck</userinput>
444+
<userinput>vcregress bincheck</userinput>
445445
<userinput>vcregress upgradecheck</userinput>
446446
</screen>
447447

@@ -456,8 +456,8 @@ $ENV{CONFIG}="Debug";
456456
</para>
457457

458458
<para>
459-
Running the TAP regression tests, with "vcregress tapcheck", requires an
460-
additional Perl module to be installed:
459+
Running the regression tests on client programs, with "vcregress bincheck",
460+
requires an additional Perl module to be installed:
461461
<variablelist>
462462
<varlistentry>
463463
<term><productname>IPC::Run</productname></term>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy