Skip to content

Commit 03ce827

Browse files
vbwagnervbwagner
committed
Merge branch 'PGPRO9_6' into PGPROEE9_6
Moved PGPROEE to 9.6.3 codebase. This caused few conflicts 1. Newer PTRACK was imported which interferre with CFS and 64-bit xid 2. Upstream 9.6.3 knows about SCRAM and complaits that it doesn't support it 3. pg_hint_plan tests use queries which plans changed in new version.
2 parents 931d24a + 9b7bb88 commit 03ce827

File tree

336 files changed

+31126
-19669
lines changed

Some content is hidden

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

336 files changed

+31126
-19669
lines changed

‎configure

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.2.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.3.
44
#
55
# Report bugs to <bugs@postgrespro.ru>.
66
#
@@ -583,8 +583,8 @@ MAKEFLAGS=
583583
# Identity of this package.
584584
PACKAGE_NAME='PostgreSQL'
585585
PACKAGE_TARNAME='postgrespro'
586-
PACKAGE_VERSION='9.6.2'
587-
PACKAGE_STRING='PostgreSQL 9.6.2'
586+
PACKAGE_VERSION='9.6.3'
587+
PACKAGE_STRING='PostgreSQL 9.6.3'
588588
PACKAGE_BUGREPORT='bugs@postgrespro.ru'
589589
PACKAGE_URL=''
590590

@@ -1406,7 +1406,7 @@ if test "$ac_init_help" = "long"; then
14061406
# Omit some internal or obsolete options to make the list less imposing.
14071407
# This message is too long to be a string in the A/UX 3.1 sh.
14081408
cat <<_ACEOF
1409-
\`configure' configures PostgreSQL 9.6.2 to adapt to many kinds of systems.
1409+
\`configure' configures PostgreSQL 9.6.3 to adapt to many kinds of systems.
14101410

14111411
Usage: $0 [OPTION]... [VAR=VALUE]...
14121412

@@ -1471,7 +1471,7 @@ fi
14711471

14721472
if test -n "$ac_init_help"; then
14731473
case $ac_init_help in
1474-
short | recursive ) echo "Configuration of PostgreSQL 9.6.2:";;
1474+
short | recursive ) echo "Configuration of PostgreSQL 9.6.3:";;
14751475
esac
14761476
cat <<\_ACEOF
14771477

@@ -1625,7 +1625,7 @@ fi
16251625
test -n "$ac_init_help" && exit $ac_status
16261626
if $ac_init_version; then
16271627
cat <<\_ACEOF
1628-
PostgreSQL configure 9.6.2
1628+
PostgreSQL configure 9.6.3
16291629
generated by GNU Autoconf 2.69
16301630

16311631
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2337,7 +2337,7 @@ cat >config.log <<_ACEOF
23372337
This file contains any messages produced by compilers while
23382338
running configure, to aid debugging if configure makes a mistake.
23392339

2340-
It was created by PostgreSQL $as_me 9.6.2, which was
2340+
It was created by PostgreSQL $as_me 9.6.3, which was
23412341
generated by GNU Autoconf 2.69. Invocation command line was
23422342

23432343
$ $0 $@
@@ -18772,7 +18772,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1877218772
# report actual input values of CONFIG_FILES etc. instead of their
1877318773
# values after options handling.
1877418774
ac_log="
18775-
This file was extended by PostgreSQL $as_me 9.6.2, which was
18775+
This file was extended by PostgreSQL $as_me 9.6.3, which was
1877618776
generated by GNU Autoconf 2.69. Invocation command line was
1877718777

1877818778
CONFIG_FILES = $CONFIG_FILES
@@ -18842,7 +18842,7 @@ _ACEOF
1884218842
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1884318843
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1884418844
ac_cs_version="\\
18845-
PostgreSQL config.status 9.6.2
18845+
PostgreSQL config.status 9.6.3
1884618846
configured by $0, generated by GNU Autoconf 2.69,
1884718847
with options \\"\$ac_cs_config\\"
1884818848

‎configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
1717
dnl
1818
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1919

20-
AC_INIT([PostgreSQL], [9.6.2], [bugs@postgrespro.ru],[postgrespro])
20+
AC_INIT([PostgreSQL], [9.6.3], [bugs@postgrespro.ru],[postgrespro])
2121
PACKAGE_TARNAME=postgrespro
2222

2323
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.

‎contrib/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ SUBDIRS = \
4040
pg_stat_statements \
4141
pg_transfer \
4242
pg_trgm \
43+
pg_tsparser \
4344
pgcrypto \
4445
pgrowlocks \
4546
pgstattuple \

‎contrib/adminpack/adminpack.c

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,27 +136,22 @@ pg_file_write(PG_FUNCTION_ARGS)
136136
(ERRCODE_DUPLICATE_FILE,
137137
errmsg("file \"%s\" exists", filename)));
138138

139-
f = fopen(filename, "wb");
139+
f = AllocateFile(filename, "wb");
140140
}
141141
else
142-
f = fopen(filename, "ab");
142+
f = AllocateFile(filename, "ab");
143143

144144
if (!f)
145145
ereport(ERROR,
146146
(errcode_for_file_access(),
147147
errmsg("could not open file \"%s\" for writing: %m",
148148
filename)));
149149

150-
if (VARSIZE(data) != 0)
151-
{
152-
count = fwrite(VARDATA(data), 1, VARSIZE(data) - VARHDRSZ, f);
153-
154-
if (count != VARSIZE(data) - VARHDRSZ)
155-
ereport(ERROR,
156-
(errcode_for_file_access(),
157-
errmsg("could not write file \"%s\": %m", filename)));
158-
}
159-
fclose(f);
150+
count = fwrite(VARDATA(data), 1, VARSIZE(data) - VARHDRSZ, f);
151+
if (count != VARSIZE(data) - VARHDRSZ || FreeFile(f))
152+
ereport(ERROR,
153+
(errcode_for_file_access(),
154+
errmsg("could not write file \"%s\": %m", filename)));
160155

161156
PG_RETURN_INT64(count);
162157
}

‎contrib/citext/expected/citext.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2274,8 +2274,8 @@ SELECT *
22742274
WHERE t.id IS NULL OR m.id IS NULL;
22752275
id | name | id | name
22762276
----+------+----+------
2277-
| | 2 | Two
22782277
2 | two | |
2278+
| | 2 | Two
22792279
(2 rows)
22802280

22812281
REFRESH MATERIALIZED VIEW CONCURRENTLY citext_matview;

‎contrib/citext/expected/citext_1.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2274,8 +2274,8 @@ SELECT *
22742274
WHERE t.id IS NULL OR m.id IS NULL;
22752275
id | name | id | name
22762276
----+------+----+------
2277-
| | 2 | Two
22782277
2 | two | |
2278+
| | 2 | Two
22792279
(2 rows)
22802280

22812281
REFRESH MATERIALIZED VIEW CONCURRENTLY citext_matview;

‎contrib/dblink/dblink.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,11 @@ dblink_connect(PG_FUNCTION_ARGS)
301301
createNewConnection(connname, rconn);
302302
}
303303
else
304+
{
305+
if (pconn->conn)
306+
PQfinish(pconn->conn);
304307
pconn->conn = conn;
308+
}
305309

306310
PG_RETURN_TEXT_P(cstring_to_text("OK"));
307311
}

‎contrib/ltree/ltxtquery_io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ gettoken_query(QPRS_STATE *state, int32 *val, int32 *lenval, char **strval, uint
9696
if (*flag)
9797
ereport(ERROR,
9898
(errcode(ERRCODE_SYNTAX_ERROR),
99-
errmsg("modificators syntax error")));
99+
errmsg("modifiers syntax error")));
100100
*lenval += charlen;
101101
}
102102
else if (charlen == 1 && t_iseq(state->buf, '%'))

0 commit comments

Comments
 (0)