Skip to content

Commit 285ebee

Browse files
vbwagnervbwagner
committed
Merge branch 'REL9_5_STABLE' into PGPRO9_5
Merge updates up to 02-Feb-16
2 parents 748350f + 829757c commit 285ebee

File tree

12 files changed

+58
-22
lines changed

12 files changed

+58
-22
lines changed

‎contrib/postgres_fdw/expected/postgres_fdw.out

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3463,7 +3463,7 @@ CREATE TABLE import_source."x 5" (c1 float8);
34633463
ALTER TABLE import_source."x 5" DROP COLUMN c1;
34643464
CREATE SCHEMA import_dest1;
34653465
IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest1;
3466-
\det+ import_dest1
3466+
\det+ import_dest1.*
34673467
List of foreign tables
34683468
Schema | Table | Server | FDW Options | Description
34693469
--------------+-------+----------+-------------------------------------------------+-------------
@@ -3519,7 +3519,7 @@ FDW Options: (schema_name 'import_source', table_name 'x 5')
35193519
CREATE SCHEMA import_dest2;
35203520
IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest2
35213521
OPTIONS (import_default 'true');
3522-
\det+ import_dest2
3522+
\det+ import_dest2.*
35233523
List of foreign tables
35243524
Schema | Table | Server | FDW Options | Description
35253525
--------------+-------+----------+-------------------------------------------------+-------------
@@ -3574,7 +3574,7 @@ FDW Options: (schema_name 'import_source', table_name 'x 5')
35743574
CREATE SCHEMA import_dest3;
35753575
IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest3
35763576
OPTIONS (import_collate 'false', import_not_null 'false');
3577-
\det+ import_dest3
3577+
\det+ import_dest3.*
35783578
List of foreign tables
35793579
Schema | Table | Server | FDW Options | Description
35803580
--------------+-------+----------+-------------------------------------------------+-------------
@@ -3630,7 +3630,7 @@ FDW Options: (schema_name 'import_source', table_name 'x 5')
36303630
CREATE SCHEMA import_dest4;
36313631
IMPORT FOREIGN SCHEMA import_source LIMIT TO (t1, nonesuch)
36323632
FROM SERVER loopback INTO import_dest4;
3633-
\det+ import_dest4
3633+
\det+ import_dest4.*
36343634
List of foreign tables
36353635
Schema | Table | Server | FDW Options | Description
36363636
--------------+-------+----------+------------------------------------------------+-------------
@@ -3639,7 +3639,7 @@ IMPORT FOREIGN SCHEMA import_source LIMIT TO (t1, nonesuch)
36393639

36403640
IMPORT FOREIGN SCHEMA import_source EXCEPT (t1, "x 4", nonesuch)
36413641
FROM SERVER loopback INTO import_dest4;
3642-
\det+ import_dest4
3642+
\det+ import_dest4.*
36433643
List of foreign tables
36443644
Schema | Table | Server | FDW Options | Description
36453645
--------------+-------+----------+-------------------------------------------------+-------------

‎contrib/postgres_fdw/sql/postgres_fdw.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -798,29 +798,29 @@ ALTER TABLE import_source."x 5" DROP COLUMN c1;
798798

799799
CREATE SCHEMA import_dest1;
800800
IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest1;
801-
\det+ import_dest1
801+
\det+ import_dest1.*
802802
\d import_dest1.*
803803

804804
-- Options
805805
CREATE SCHEMA import_dest2;
806806
IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest2
807807
OPTIONS (import_default 'true');
808-
\det+ import_dest2
808+
\det+ import_dest2.*
809809
\d import_dest2.*
810810
CREATE SCHEMA import_dest3;
811811
IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest3
812812
OPTIONS (import_collate 'false', import_not_null 'false');
813-
\det+ import_dest3
813+
\det+ import_dest3.*
814814
\d import_dest3.*
815815

816816
-- Check LIMIT TO and EXCEPT
817817
CREATE SCHEMA import_dest4;
818818
IMPORT FOREIGN SCHEMA import_source LIMIT TO (t1, nonesuch)
819819
FROM SERVER loopback INTO import_dest4;
820-
\det+ import_dest4
820+
\det+ import_dest4.*
821821
IMPORT FOREIGN SCHEMA import_source EXCEPT (t1, "x 4", nonesuch)
822822
FROM SERVER loopback INTO import_dest4;
823-
\det+ import_dest4
823+
\det+ import_dest4.*
824824

825825
-- Assorted error cases
826826
IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest4;

‎doc/src/sgml/bgworker.sgml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,8 @@ typedef struct BackgroundWorker
232232
</para>
233233

234234
<para>
235-
The <filename>worker_spi</> contrib module contains a working example,
235+
The <filename>src/test/modules/worker_spi</> module
236+
contains a working example,
236237
which demonstrates some useful techniques.
237238
</para>
238239

‎doc/src/sgml/installation.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2579,7 +2579,7 @@ PHSS_30849 s700_800 u2comp/be/plugin library Patch
25792579
from <ulink url="http://mingw-w64.sourceforge.net/"></ulink>, put its bin
25802580
directory in the <envar>PATH</envar>, and run
25812581
<command>configure</command> with the
2582-
<command>--host=x86_64-w64-mingw</command> option.
2582+
<command>--host=x86_64-w64-mingw32</command> option.
25832583
</para>
25842584

25852585
<para>

‎doc/src/sgml/logicaldecoding.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,15 +280,15 @@ $ pg_recvlogical -d postgres --slot test --drop-slot
280280
The commands
281281
<itemizedlist>
282282
<listitem>
283-
<para><literal>CREATE_REPLICATION_SLOT <replaceable>slot_name</replaceable> LOGICAL <replaceable>options</replaceable></literal></para>
283+
<para><literal>CREATE_REPLICATION_SLOT <replaceable>slot_name</replaceable> LOGICAL <replaceable>output_plugin</replaceable></literal></para>
284284
</listitem>
285285

286286
<listitem>
287287
<para><literal>DROP_REPLICATION_SLOT <replaceable>slot_name</replaceable></literal></para>
288288
</listitem>
289289

290290
<listitem>
291-
<para><literal>START_REPLICATION SLOT <replaceable>slot_name</replaceable> LOGICAL <replaceable>options</replaceable></literal></para>
291+
<para><literal>START_REPLICATION SLOT <replaceable>slot_name</replaceable> LOGICAL ...</literal></para>
292292
</listitem>
293293
</itemizedlist>
294294
are used to create, drop, and stream changes from a replication

‎doc/src/sgml/ref/alter_user.sgml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> [ WIT
3232
| INHERIT | NOINHERIT
3333
| LOGIN | NOLOGIN
3434
| REPLICATION | NOREPLICATION
35+
| BYPASSRLS | NOBYPASSRLS
3536
| CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable>
3637
| [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
3738
| VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>'

‎doc/src/sgml/ref/create_user.sgml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
3232
| INHERIT | NOINHERIT
3333
| LOGIN | NOLOGIN
3434
| REPLICATION | NOREPLICATION
35+
| BYPASSRLS | NOBYPASSRLS
3536
| CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable>
3637
| [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
3738
| VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>'

‎src/backend/access/transam/xloginsert.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ XLogInsert(RmgrId rmid, uint8 info)
443443
/*
444444
* Get values needed to decide whether to do full-page writes. Since
445445
* we don't yet have an insertion lock, these could change under us,
446-
* but XLogInsertRecData will recheck them once it has a lock.
446+
* but XLogInsertRecord will recheck them once it has a lock.
447447
*/
448448
GetFullPageWriteInfo(&RedoRecPtr, &doPageWrites);
449449

‎src/bin/pgbench/pgbench.c

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,29 @@ evaluateExpr(CState *st, PgBenchExpr *expr, int64 *retval)
961961
fprintf(stderr, "division by zero\n");
962962
return false;
963963
}
964-
*retval = lval / rval;
964+
965+
/*
966+
* INT64_MIN / -1 is problematic, since the result
967+
* can't be represented on a two's-complement machine.
968+
* Some machines produce INT64_MIN, some produce zero,
969+
* some throw an exception. We can dodge the problem
970+
* by recognizing that division by -1 is the same as
971+
* negation.
972+
*/
973+
if (rval == -1)
974+
{
975+
*retval = -lval;
976+
977+
/* overflow check (needed for INT64_MIN) */
978+
if (lval == PG_INT64_MIN)
979+
{
980+
fprintf(stderr, "bigint out of range\n");
981+
return false;
982+
}
983+
}
984+
else
985+
*retval = lval / rval;
986+
965987
return true;
966988

967989
case '%':
@@ -970,7 +992,17 @@ evaluateExpr(CState *st, PgBenchExpr *expr, int64 *retval)
970992
fprintf(stderr, "division by zero\n");
971993
return false;
972994
}
973-
*retval = lval % rval;
995+
996+
/*
997+
* Some machines throw a floating-point exception for
998+
* INT64_MIN % -1. Dodge that problem by noting that
999+
* any value modulo -1 is 0.
1000+
*/
1001+
if (rval == -1)
1002+
*retval = 0;
1003+
else
1004+
*retval = lval % rval;
1005+
9741006
return true;
9751007
}
9761008

‎src/bin/psql/describe.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4412,7 +4412,8 @@ listForeignTables(const char *pattern, bool verbose)
44124412
"d.objoid = c.oid AND d.objsubid = 0\n");
44134413

44144414
processSQLNamePattern(pset.db, &buf, pattern, false, false,
4415-
NULL, "n.nspname", "c.relname", NULL);
4415+
"n.nspname", "c.relname", NULL,
4416+
"pg_catalog.pg_table_is_visible(c.oid)");
44164417

44174418
appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
44184419

‎src/interfaces/ecpg/include/datetime.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#include <ecpg_informix.h>
77

8-
#ifndef _ECPGLIB_H /* source created by ecpg which defines these
9-
* symbols */
8+
/* source created by ecpg which defines these symbols */
9+
#ifndef _ECPGLIB_H
1010
typedef timestamp dtime_t;
1111
typedef interval intrvl_t;
1212
#endif /* ndef _ECPGLIB_H */

‎src/interfaces/ecpg/include/decimal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#include <ecpg_informix.h>
77

8-
#ifndef _ECPGLIB_H /* source created by ecpg which defines this
9-
* symbol */
8+
/* source created by ecpg which defines this */
9+
#ifndef _ECPGLIB_H
1010
typedef decimal dec_t;
1111
#endif /* ndef _ECPGLIB_H */
1212

0 commit comments

Comments
 (0)