Skip to content

Commit 4fd9207

Browse files
vbwagnervbwagner
committed
Fix conflicts on version increase
2 parents bdbee68 + 16e7c02 commit 4fd9207

File tree

38 files changed

+10821
-4715
lines changed

38 files changed

+10821
-4715
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.0.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.1.
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.0'
587-
PACKAGE_STRING='PostgreSQL 9.6.0'
586+
PACKAGE_VERSION='9.6.1'
587+
PACKAGE_STRING='PostgreSQL 9.6.1'
588588
PACKAGE_BUGREPORT='bugs@postgrespro.ru'
589589
PACKAGE_URL=''
590590

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

14081408
Usage: $0 [OPTION]... [VAR=VALUE]...
14091409

@@ -1468,7 +1468,7 @@ fi
14681468

14691469
if test -n "$ac_init_help"; then
14701470
case $ac_init_help in
1471-
short | recursive ) echo "Configuration of PostgreSQL 9.6.0:";;
1471+
short | recursive ) echo "Configuration of PostgreSQL 9.6.1:";;
14721472
esac
14731473
cat <<\_ACEOF
14741474

@@ -1621,7 +1621,7 @@ fi
16211621
test -n "$ac_init_help" && exit $ac_status
16221622
if $ac_init_version; then
16231623
cat <<\_ACEOF
1624-
PostgreSQL configure 9.6.0
1624+
PostgreSQL configure 9.6.1
16251625
generated by GNU Autoconf 2.69
16261626

16271627
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2333,7 +2333,7 @@ cat >config.log <<_ACEOF
23332333
This file contains any messages produced by compilers while
23342334
running configure, to aid debugging if configure makes a mistake.
23352335

2336-
It was created by PostgreSQL $as_me 9.6.0, which was
2336+
It was created by PostgreSQL $as_me 9.6.1, which was
23372337
generated by GNU Autoconf 2.69. Invocation command line was
23382338

23392339
$ $0 $@
@@ -18358,7 +18358,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1835818358
# report actual input values of CONFIG_FILES etc. instead of their
1835918359
# values after options handling.
1836018360
ac_log="
18361-
This file was extended by PostgreSQL $as_me 9.6.0, which was
18361+
This file was extended by PostgreSQL $as_me 9.6.1, which was
1836218362
generated by GNU Autoconf 2.69. Invocation command line was
1836318363

1836418364
CONFIG_FILES = $CONFIG_FILES
@@ -18428,7 +18428,7 @@ _ACEOF
1842818428
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1842918429
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1843018430
ac_cs_version="\\
18431-
PostgreSQL config.status 9.6.0
18431+
PostgreSQL config.status 9.6.1
1843218432
configured by $0, generated by GNU Autoconf 2.69,
1843318433
with options \\"\$ac_cs_config\\"
1843418434

‎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.0], [bugs@postgrespro.ru],[postgrespro])
20+
AC_INIT([PostgreSQL], [9.6.1], [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.

‎doc/bug.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ System Configuration:
2727

2828
Operating System (example: Linux 2.4.18) :
2929

30-
PostgreSQL version (example: PostgreSQL 9.6.0): PostgreSQL 9.6.0
30+
PostgreSQL version (example: PostgreSQL 9.6.1): PostgreSQL 9.6.1
3131

3232
Compiler used (example: gcc 3.3.5) :
3333

‎doc/src/sgml/release-9.5.sgml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,18 @@ Branch: REL9_1_STABLE [7e01c8ef3] 2016-08-14 15:06:02 -0400
319319
</para>
320320
</listitem>
321321

322+
<listitem>
323+
<para>
324+
Preserve commit timestamps across server restart
325+
(Julien Rouhaud, Craig Ringer)
326+
</para>
327+
328+
<para>
329+
With <xref linkend="guc-track-commit-timestamp"> turned on, old
330+
commit timestamps became inaccessible after a clean server restart.
331+
</para>
332+
</listitem>
333+
322334
<listitem>
323335
<para>
324336
Fix logical WAL decoding to work properly when a subtransaction's WAL

‎doc/src/sgml/release-9.6.sgml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,24 @@ Branch: REL9_5_STABLE [beac79369] 2016-10-23 19:14:32 -0400
280280

281281
<listitem>
282282
<!--
283+
Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
284+
Branch: master [00f15338b] 2016-10-24 09:45:48 -0300
285+
Branch: REL9_6_STABLE [c8329f934] 2016-10-24 09:46:49 -0300
286+
Branch: REL9_5_STABLE [7a2fa5774] 2016-10-24 09:38:28 -0300
287+
-->
288+
<para>
289+
Preserve commit timestamps across server restart
290+
(Julien Rouhaud, Craig Ringer)
291+
</para>
292+
293+
<para>
294+
With <xref linkend="guc-track-commit-timestamp"> turned on, old
295+
commit timestamps became inaccessible after a clean server restart.
296+
</para>
297+
</listitem>
298+
299+
<listitem>
300+
<!--
283301
Author: Andres Freund <andres@anarazel.de>
284302
Branch: master [61633f790] 2016-10-03 22:11:36 -0700
285303
Branch: REL9_6_STABLE [76c0b73df] 2016-10-03 22:12:31 -0700

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -843,6 +843,8 @@ SetCommitTsLimit(TransactionId oldestXact, TransactionId newestXact)
843843
else
844844
{
845845
Assert(ShmemVariableCache->newestCommitTsXid == InvalidTransactionId);
846+
ShmemVariableCache->oldestCommitTsXid = oldestXact;
847+
ShmemVariableCache->newestCommitTsXid = newestXact;
846848
}
847849
LWLockRelease(CommitTsLock);
848850
}

0 commit comments

Comments
 (0)