Skip to content

Commit 6820e3f

Browse files
dmpgprodmpgpro
committed
Merge tag 'PGPRO9_6_1_1' into PGPROEE9_6
Conflicts: configure configure.in doc/src/sgml/release-pro-9.6.sgml src/include/pg_config.h.win32
2 parents 953f68a + e30507b commit 6820e3f

File tree

40 files changed

+10908
-4725
lines changed

40 files changed

+10908
-4725
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

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

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

@@ -1469,7 +1469,7 @@ fi
14691469

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

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

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

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

23402340
$ $0 $@
@@ -18366,7 +18366,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1836618366
# report actual input values of CONFIG_FILES etc. instead of their
1836718367
# values after options handling.
1836818368
ac_log="
18369-
This file was extended by PostgreSQL $as_me 9.6.0, which was
18369+
This file was extended by PostgreSQL $as_me 9.6.1, which was
1837018370
generated by GNU Autoconf 2.69. Invocation command line was
1837118371

1837218372
CONFIG_FILES = $CONFIG_FILES
@@ -18436,7 +18436,7 @@ _ACEOF
1843618436
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1843718437
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1843818438
ac_cs_version="\\
18439-
PostgreSQL config.status 9.6.0
18439+
PostgreSQL config.status 9.6.1
1844018440
configured by $0, generated by GNU Autoconf 2.69,
1844118441
with options \\"\$ac_cs_config\\"
1844218442

‎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

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

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<!-- doc/src/sgml/release-pro-9.6.sgml -->
22
<!-- See header comment in release.sgml about typical markup -->
3-
<sect1 id="release-pro-enterprise-9-6-0-1">
4-
<title>&productname; 9.6.0.1</title>
3+
<sect1 id="release-pro-enterprise-9-6-1-1">
4+
<title>&productname; 9.6.1.1</title>
55
<note>
66
<title>Release Date</title>
7-
<simpara>2016-10-28</simpara>
7+
<simpara>2016-11-__</simpara>
88
</note>
99
<sect2>
1010
<title>Overview</title>
1111
<para>This release is based on <productname>Postgres Pro</productname>
12-
9.6.0.1</para>
12+
9.6.1.1</para>
1313
<para>Major enhancements over <productname>Postgres Pro</productname>
14-
9.6.0 include:</para>
14+
9.6.1.1 include:</para>
1515
<para>Added k-nearest neighbors algorithm (KNN) for SP-GiST and B-tree
1616
(See <xref linkend="spgist">)</para>
1717
<para>Added RUM index, based on GIN, as separate module (See <xref linkend="rum">)</para>
@@ -21,7 +21,7 @@
2121
<para>Added page level compression (CFS) (See <xref linkend="cfs">)</para>
2222
</sect2>
2323
<sect2>
24-
<title>Migration to Version &productname; 9.6.0.1</title>
24+
<title>Migration to Version &productname; 9.6.1.1</title>
2525

2626
<para>A dump/restore using <xref linkend="app-pg-dumpall">, or
2727
use of <xref linkend="pgupgrade">, is required for those
@@ -40,7 +40,51 @@
4040
should run <literal>pgpro_upgrade</literal> script provided in this
4141
distribution.
4242
</para>
43-
43+
44+
<para>Before running script, you should stop postgres service. Script
45+
should be run as user, owning the database (typically postgres) and
46+
PGDATA environment variable should be set to the directory where
47+
database resides.
48+
</para>
49+
</sect2>
50+
</sect1>
51+
<sect1 id="release-pro-9-6-1-1">
52+
<title>Postgres Pro 9.6.1.1</title>
53+
<note>
54+
<title>Release Date</title>
55+
<simpara>2016-11-01</simpara>
56+
</note>
57+
<sect2>
58+
<title>Overview</title>
59+
<para>This release is based on <productname>PostgreSQL</productname>
60+
9.6.1</para>
61+
<para>Major enhancements over <productname>Postgres Pro</productname>
62+
9.6.0.1 include:</para>
63+
<para>Added fix for <application>pg_buffercache</application> module,
64+
which improves database response in the case of connected
65+
monitoring tools.</para>
66+
<para>Added new <application>pgpro_edition()</application> function,
67+
which returns a name of <productname>Postgres Pro</productname> edition,
68+
i.e. <literal>standard</literal> or <literal>enterprise</literal>.
69+
</para>
70+
</sect2>
71+
<sect2>
72+
<title>Migration to Version 9.6.1.1</title>
73+
<para>A dump/restore using <xref linkend="app-pg-dumpall">, or
74+
use of <xref linkend="pgupgrade">, is required for those
75+
wishing to migrate data from any previous major release.
76+
</para>
77+
<para>A dump/restore is not required for those running 9.6.0.1.</para>
78+
<para>However, if you are upgrading from vanilla PostgreSQL 9.6.x, some
79+
catalog changes should be applied.
80+
</para>
81+
<para>If you use binary packages, and your database is in the default
82+
location, this upgrade should be performed automatically. If you've
83+
compiled Postgres Pro from source or create your database in
84+
non-default location, running <literal>initdb</literal> manually, you
85+
should run <literal>pgpro_upgrade</literal> script provided in this
86+
distribution.
87+
</para>
4488
<para>Before running script, you should stop postgres service. Script
4589
should be run as user, owning the database (typically postgres) and
4690
PGDATA environment variable should be set to the directory where

‎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)