Stamp HEAD as 9.0devel, and update various places that were referring to 8.5

(hope I got 'em all).  Per discussion, this release will be 9.0 not 8.5.
This commit is contained in:
Tom Lane 2010-02-17 04:19:41 +00:00
parent 37ec19a15c
commit 50a90fac40
48 changed files with 133 additions and 133 deletions

18
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for PostgreSQL 8.5devel. # Generated by GNU Autoconf 2.63 for PostgreSQL 9.0devel.
# #
# Report bugs to <pgsql-bugs@postgresql.org>. # Report bugs to <pgsql-bugs@postgresql.org>.
# #
@ -598,8 +598,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='PostgreSQL' PACKAGE_NAME='PostgreSQL'
PACKAGE_TARNAME='postgresql' PACKAGE_TARNAME='postgresql'
PACKAGE_VERSION='8.5devel' PACKAGE_VERSION='9.0devel'
PACKAGE_STRING='PostgreSQL 8.5devel' PACKAGE_STRING='PostgreSQL 9.0devel'
PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org' PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
ac_unique_file="src/backend/access/common/heaptuple.c" ac_unique_file="src/backend/access/common/heaptuple.c"
@ -1410,7 +1410,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures PostgreSQL 8.5devel to adapt to many kinds of systems. \`configure' configures PostgreSQL 9.0devel to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1475,7 +1475,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of PostgreSQL 8.5devel:";; short | recursive ) echo "Configuration of PostgreSQL 9.0devel:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1621,7 +1621,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
PostgreSQL configure 8.5devel PostgreSQL configure 9.0devel
generated by GNU Autoconf 2.63 generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1637,7 +1637,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by PostgreSQL $as_me 8.5devel, which was It was created by PostgreSQL $as_me 9.0devel, which was
generated by GNU Autoconf 2.63. Invocation command line was generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@ $ $0 $@
@ -29375,7 +29375,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by PostgreSQL $as_me 8.5devel, which was This file was extended by PostgreSQL $as_me 9.0devel, which was
generated by GNU Autoconf 2.63. Invocation command line was generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -29442,7 +29442,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\ ac_cs_version="\\
PostgreSQL config.status 8.5devel PostgreSQL config.status 9.0devel
configured by $0, generated by GNU Autoconf 2.63, configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

View File

@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl $PostgreSQL: pgsql/configure.in,v 1.622 2010/02/13 02:34:11 tgl Exp $ dnl $PostgreSQL: pgsql/configure.in,v 1.623 2010/02/17 04:19:37 tgl Exp $
dnl dnl
dnl Developers, please strive to achieve this order: dnl Developers, please strive to achieve this order:
dnl dnl
@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
dnl dnl
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
AC_INIT([PostgreSQL], [8.5devel], [pgsql-bugs@postgresql.org]) AC_INIT([PostgreSQL], [9.0devel], [pgsql-bugs@postgresql.org])
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
Untested combinations of 'autoconf' and PostgreSQL versions are not Untested combinations of 'autoconf' and PostgreSQL versions are not

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/contrib/vacuumlo/vacuumlo.c,v 1.44 2010/01/02 16:57:33 momjian Exp $ * $PostgreSQL: pgsql/contrib/vacuumlo/vacuumlo.c,v 1.45 2010/02/17 04:19:37 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -142,7 +142,7 @@ vacuumlo(char *database, struct _param * param)
*/ */
buf[0] = '\0'; buf[0] = '\0';
strcat(buf, "CREATE TEMP TABLE vacuum_l AS "); strcat(buf, "CREATE TEMP TABLE vacuum_l AS ");
if (PQserverVersion(conn) >= 80500) if (PQserverVersion(conn) >= 90000)
strcat(buf, "SELECT oid AS lo FROM pg_largeobject_metadata"); strcat(buf, "SELECT oid AS lo FROM pg_largeobject_metadata");
else else
strcat(buf, "SELECT DISTINCT loid AS lo FROM pg_largeobject"); strcat(buf, "SELECT DISTINCT loid AS lo FROM pg_largeobject");

View File

@ -27,7 +27,7 @@ System Configuration:
Operating System (example: Linux 2.4.18) : Operating System (example: Linux 2.4.18) :
PostgreSQL version (example: PostgreSQL 8.5devel): PostgreSQL 8.5devel PostgreSQL version (example: PostgreSQL 9.0devel): PostgreSQL 9.0devel
Compiler used (example: gcc 3.3.5) : Compiler used (example: gcc 3.3.5) :

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.222 2010/02/16 22:34:41 tgl Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.223 2010/02/17 04:19:37 tgl Exp $ -->
<!-- <!--
Documentation of the system catalogs, directed toward PostgreSQL developers Documentation of the system catalogs, directed toward PostgreSQL developers
--> -->
@ -3134,7 +3134,7 @@
</para> </para>
<para> <para>
Prior to <productname>PostgreSQL</> 8.5, there was no permission structure Prior to <productname>PostgreSQL</> 9.0, there was no permission structure
associated with large objects. As a result, associated with large objects. As a result,
<structname>pg_largeobject</structname> was publicly readable and could be <structname>pg_largeobject</structname> was publicly readable and could be
used to obtain the OIDs (and contents) of all large objects in the system. used to obtain the OIDs (and contents) of all large objects in the system.

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.251 2010/02/16 21:35:51 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.252 2010/02/17 04:19:37 tgl Exp $ -->
<chapter Id="runtime-config"> <chapter Id="runtime-config">
<title>Server Configuration</title> <title>Server Configuration</title>
@ -4977,7 +4977,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
</indexterm> </indexterm>
<listitem> <listitem>
<para> <para>
In <productname>PostgreSQL</> releases prior to 8.5, large objects In <productname>PostgreSQL</> releases prior to 9.0, large objects
did not have access privileges and were, in effect, readable and did not have access privileges and were, in effect, readable and
writable by all users. Setting this variable to <literal>on</> writable by all users. Setting this variable to <literal>on</>
disables the new privilege checks, for compatibility with prior disables the new privilege checks, for compatibility with prior
@ -4985,8 +4985,8 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
</para> </para>
<para> <para>
Setting this variable does not disable all security checks for Setting this variable does not disable all security checks for
large objects - only those for which the default behavior has changed large objects &mdash; only those for which the default behavior has
in <productname>PostgreSQL</> 8.5. changed in <productname>PostgreSQL</> 9.0.
For example, <literal>lo_import()</literal> and For example, <literal>lo_import()</literal> and
<literal>lo_export()</literal> need superuser privileges independent <literal>lo_export()</literal> need superuser privileges independent
of this setting. of this setting.

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.241 2009/08/04 16:08:35 tgl Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.242 2010/02/17 04:19:37 tgl Exp $ -->
<chapter id="datatype"> <chapter id="datatype">
<title id="datatype-title">Data Types</title> <title id="datatype-title">Data Types</title>
@ -1197,7 +1197,7 @@ SELECT b, char_length(b) FROM test2;
of these are always accepted on input. The output format depends of these are always accepted on input. The output format depends
on the configuration parameter <xref linkend="guc-bytea-output">; on the configuration parameter <xref linkend="guc-bytea-output">;
the default is hex. (Note that the hex format was introduced in the default is hex. (Note that the hex format was introduced in
<productname>PostgreSQL</productname> 8.5; earlier versions and some <productname>PostgreSQL</productname> 9.0; earlier versions and some
tools don't understand it.) tools don't understand it.)
</para> </para>

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.95 2010/01/26 14:21:29 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.96 2010/02/17 04:19:37 tgl Exp $ -->
<chapter id="ecpg"> <chapter id="ecpg">
<title><application>ECPG</application> - Embedded <acronym>SQL</acronym> in C</title> <title><application>ECPG</application> - Embedded <acronym>SQL</acronym> in C</title>
@ -2439,7 +2439,7 @@ EXEC SQL DESCRIBE stmt1 INTO SQL DESCRIPTOR mydesc;
</para> </para>
<para> <para>
Before PostgreSQL 8.5, the <literal>SQL</literal> keyword was optional, Before PostgreSQL 9.0, the <literal>SQL</literal> keyword was optional,
so using <literal>DESCRIPTOR</literal> and <literal>SQL DESCRIPTOR</literal> so using <literal>DESCRIPTOR</literal> and <literal>SQL DESCRIPTOR</literal>
produced named SQL Descriptor Areas. Now it is mandatory, omitting produced named SQL Descriptor Areas. Now it is mandatory, omitting
the <literal>SQL</literal> keyword produces SQLDA Descriptor Areas, the <literal>SQL</literal> keyword produces SQLDA Descriptor Areas,

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/filelist.sgml,v 1.65 2009/11/18 21:57:56 tgl Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/filelist.sgml,v 1.66 2010/02/17 04:19:37 tgl Exp $ -->
<!entity history SYSTEM "history.sgml"> <!entity history SYSTEM "history.sgml">
<!entity info SYSTEM "info.sgml"> <!entity info SYSTEM "info.sgml">
@ -142,7 +142,7 @@
<!entity keywords SYSTEM "keywords.sgml"> <!entity keywords SYSTEM "keywords.sgml">
<!entity release SYSTEM "release.sgml"> <!entity release SYSTEM "release.sgml">
<!entity release-8.5 SYSTEM "release-8.5.sgml"> <!entity release-9.0 SYSTEM "release-9.0.sgml">
<!entity release-8.4 SYSTEM "release-8.4.sgml"> <!entity release-8.4 SYSTEM "release-8.4.sgml">
<!entity release-8.3 SYSTEM "release-8.3.sgml"> <!entity release-8.3 SYSTEM "release-8.3.sgml">
<!entity release-8.2 SYSTEM "release-8.2.sgml"> <!entity release-8.2 SYSTEM "release-8.2.sgml">

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.43 2010/02/13 03:38:26 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.44 2010/02/17 04:19:37 tgl Exp $ -->
<chapter id="high-availability"> <chapter id="high-availability">
<title>High Availability, Load Balancing, and Replication</title> <title>High Availability, Load Balancing, and Replication</title>
@ -747,7 +747,7 @@ if (!triggered)
</para> </para>
<para> <para>
Starting with <productname>PostgreSQL</> version 8.5, you can use Starting with <productname>PostgreSQL</> version 9.0, you can use
streaming replication (see <xref linkend="streaming-replication">) to streaming replication (see <xref linkend="streaming-replication">) to
achieve the same with less effort. achieve the same with less effort.
</para> </para>

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/hstore.sgml,v 1.6 2009/12/16 19:38:54 mha Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/hstore.sgml,v 1.7 2010/02/17 04:19:37 tgl Exp $ -->
<sect1 id="hstore"> <sect1 id="hstore">
<title>hstore</title> <title>hstore</title>
@ -542,7 +542,7 @@ SELECT key, count(*) FROM
</para> </para>
<para> <para>
As of PostgreSQL 8.5, <type>hstore</> uses a different internal As of PostgreSQL 9.0, <type>hstore</> uses a different internal
representation than previous versions. This presents no obstacle for representation than previous versions. This presents no obstacle for
dump/restore upgrades since the text representation (used in the dump) is dump/restore upgrades since the text representation (used in the dump) is
unchanged. unchanged.

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.299 2010/02/16 22:34:42 tgl Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.300 2010/02/17 04:19:37 tgl Exp $ -->
<chapter id="libpq"> <chapter id="libpq">
<title><application>libpq</application> - C Library</title> <title><application>libpq</application> - C Library</title>
@ -1255,7 +1255,7 @@ PQconninfoOption *PQconninfoParse(const char *conninfo, char **errmsg);
<literal>standard_conforming_strings</> was not reported by releases <literal>standard_conforming_strings</> was not reported by releases
before 8.1; before 8.1;
<literal>IntervalStyle</> was not reported by releases before 8.4; <literal>IntervalStyle</> was not reported by releases before 8.4;
<literal>application_name</> was not reported by releases before 8.5.) <literal>application_name</> was not reported by releases before 9.0.)
Note that Note that
<literal>server_version</>, <literal>server_version</>,
<literal>server_encoding</> and <literal>server_encoding</> and

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/lobj.sgml,v 1.51 2009/12/17 14:36:16 rhaas Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/lobj.sgml,v 1.52 2010/02/17 04:19:37 tgl Exp $ -->
<chapter id="largeObjects"> <chapter id="largeObjects">
<title id="largeObjects-title">Large Objects</title> <title id="largeObjects-title">Large Objects</title>
@ -61,7 +61,7 @@
</para> </para>
<para> <para>
As of <productname>PostgreSQL</> 8.5, large objects have an owner As of <productname>PostgreSQL</> 9.0, large objects have an owner
and a set of access permissions, which can be managed using and a set of access permissions, which can be managed using
<xref linkend="sql-grant" endterm="sql-grant-title"> and <xref linkend="sql-grant" endterm="sql-grant-title"> and
<xref linkend="sql-revoke" endterm="sql-revoke-title">. <xref linkend="sql-revoke" endterm="sql-revoke-title">.

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.150 2010/01/19 01:35:30 tgl Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.151 2010/02/17 04:19:37 tgl Exp $ -->
<chapter id="plpgsql"> <chapter id="plpgsql">
<title><application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language</title> <title><application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language</title>
@ -59,7 +59,7 @@
</para> </para>
<para> <para>
In <productname>PostgreSQL</> 8.5 and later, In <productname>PostgreSQL</> 9.0 and later,
<application>PL/pgSQL</application> is installed by default. <application>PL/pgSQL</application> is installed by default.
However it is still a loadable module, so especially security-conscious However it is still a loadable module, so especially security-conscious
administrators could choose to remove it. administrators could choose to remove it.
@ -3520,7 +3520,7 @@ SELECT * FROM sales_summary_bytime;
<note> <note>
<para> <para>
<productname>PostgreSQL</productname> versions before 8.5 would try <productname>PostgreSQL</productname> versions before 9.0 would try
to substitute the variable in all three cases, leading to syntax errors. to substitute the variable in all three cases, leading to syntax errors.
</para> </para>
</note> </note>
@ -3583,7 +3583,7 @@ SELECT * FROM sales_summary_bytime;
large body of <application>PL/pgSQL</> code. In such cases you can large body of <application>PL/pgSQL</> code. In such cases you can
specify that <application>PL/pgSQL</> should resolve ambiguous references specify that <application>PL/pgSQL</> should resolve ambiguous references
as the variable (which is compatible with <application>PL/pgSQL</>'s as the variable (which is compatible with <application>PL/pgSQL</>'s
behavior before <productname>PostgreSQL</productname> 8.5), or as the behavior before <productname>PostgreSQL</productname> 9.0), or as the
table column (which is compatible with some other systems such as table column (which is compatible with some other systems such as
<productname>Oracle</productname>). <productname>Oracle</productname>).
</para> </para>

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/protocol.sgml,v 1.81 2010/02/16 22:34:43 tgl Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/protocol.sgml,v 1.82 2010/02/17 04:19:37 tgl Exp $ -->
<chapter id="protocol"> <chapter id="protocol">
<title>Frontend/Backend Protocol</title> <title>Frontend/Backend Protocol</title>
@ -1101,7 +1101,7 @@
<literal>standard_conforming_strings</> was not reported by releases <literal>standard_conforming_strings</> was not reported by releases
before 8.1; before 8.1;
<literal>IntervalStyle</> was not reported by releases before 8.4; <literal>IntervalStyle</> was not reported by releases before 8.4;
<literal>application_name</> was not reported by releases before 8.5.) <literal>application_name</> was not reported by releases before 9.0.)
Note that Note that
<literal>server_version</>, <literal>server_version</>,
<literal>server_encoding</> and <literal>server_encoding</> and

View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.92 2009/09/21 20:10:21 tgl Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.93 2010/02/17 04:19:39 tgl Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -839,7 +839,7 @@ ZW ZIMBABWE
<para> <para>
The following syntax was used before <productname>PostgreSQL</> The following syntax was used before <productname>PostgreSQL</>
version 8.5 and is still supported: version 9.0 and is still supported:
<synopsis> <synopsis>
COPY <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ] COPY <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ]

View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/explain.sgml,v 1.48 2009/12/15 04:57:47 rhaas Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/explain.sgml,v 1.49 2010/02/17 04:19:39 tgl Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -94,7 +94,7 @@ ROLLBACK;
<para> <para>
Only the <literal>ANALYZE</literal> and <literal>VERBOSE</literal> options Only the <literal>ANALYZE</literal> and <literal>VERBOSE</literal> options
can be specified, and only in that order, without surrounding the option can be specified, and only in that order, without surrounding the option
list in parentheses. Prior to <productname>PostgreSQL</productname> 8.5, list in parentheses. Prior to <productname>PostgreSQL</productname> 9.0,
the unparenthesized syntax was the only one supported. It is expected that the unparenthesized syntax was the only one supported. It is expected that
all new options will be supported only in the parenthesized syntax. all new options will be supported only in the parenthesized syntax.
</para> </para>

View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.58 2010/02/08 04:33:51 tgl Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.59 2010/02/17 04:19:39 tgl Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -70,7 +70,7 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">
When the option list is surrounded by parentheses, the options can be When the option list is surrounded by parentheses, the options can be
written in any order. Without parentheses, options must be specified written in any order. Without parentheses, options must be specified
in exactly the order shown above. in exactly the order shown above.
Prior to <productname>PostgreSQL</productname> 8.5, the unparenthesized Prior to <productname>PostgreSQL</productname> 9.0, the unparenthesized
syntax was the only one supported. It is expected that all new options syntax was the only one supported. It is expected that all new options
will be supported only in the parenthesized syntax. will be supported only in the parenthesized syntax.
</para> </para>

View File

@ -1,7 +1,7 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/release-8.5.sgml,v 1.14 2009/12/19 20:33:12 petere Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/release-9.0.sgml,v 2.1 2010/02/17 04:19:37 tgl Exp $ -->
<sect1 id="release-8-5"> <sect1 id="release-9-0">
<title>Release 8.5alpha3</title> <title>Release 9.0alpha3</title>
<sect2> <sect2>
<title>Overview</title> <title>Overview</title>
<para> <para>

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.634 2009/08/17 22:14:44 petere Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.635 2010/02/17 04:19:37 tgl Exp $ -->
<!-- <!--
Typical markup: Typical markup:
@ -70,7 +70,7 @@ can be created without links to the main documentation.
The reason for splitting the release notes this way is so that appropriate The reason for splitting the release notes this way is so that appropriate
subsets can easily be copied into back branches. subsets can easily be copied into back branches.
--> -->
&release-8.5; &release-9.0;
&release-8.4; &release-8.4;
&release-8.3; &release-8.3;
&release-8.2; &release-8.2;

View File

@ -28,7 +28,7 @@
<xsl:param name="man.output.base.dir"></xsl:param> <xsl:param name="man.output.base.dir"></xsl:param>
<xsl:param name="man.output.in.separate.dir" select="1"></xsl:param> <xsl:param name="man.output.in.separate.dir" select="1"></xsl:param>
<xsl:param name="refentry.meta.get.quietly" select="0"></xsl:param> <xsl:param name="refentry.meta.get.quietly" select="0"></xsl:param>
<xsl:param name="man.th.extra3.max.length">40</xsl:param> <!-- enough room for "PostgreSQL 8.5devel Documentation" --> <xsl:param name="man.th.extra3.max.length">40</xsl:param> <!-- enough room for "PostgreSQL X.Ydevel Documentation" -->
<xsl:param name="refentry.xref.manvolnum" select="1"/> <!-- overridden from stylesheet-common.xsl --> <xsl:param name="refentry.xref.manvolnum" select="1"/> <!-- overridden from stylesheet-common.xsl -->
<!-- Fixup for apostrophe groff output. See the following references: <!-- Fixup for apostrophe groff output. See the following references:

View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.286 2010/02/16 22:34:43 tgl Exp $ * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.287 2010/02/17 04:19:39 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -4344,7 +4344,7 @@ xactGetCommittedChildren(TransactionId **ptr)
*/ */
/* /*
* Before 8.5 this was a fairly short function, but now it performs many * Before 9.0 this was a fairly short function, but now it performs many
* actions for which the order of execution is critical. * actions for which the order of execution is critical.
*/ */
static void static void

View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.374 2010/02/17 03:10:33 tgl Exp $ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.375 2010/02/17 04:19:39 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -7958,7 +7958,7 @@ pg_start_backup_callback(int code, Datum arg)
* created by pg_start_backup, creating a backup history file in pg_xlog * created by pg_start_backup, creating a backup history file in pg_xlog
* instead (whence it will immediately be archived). The backup history file * instead (whence it will immediately be archived). The backup history file
* contains the same info found in the label file, plus the backup-end time * contains the same info found in the label file, plus the backup-end time
* and WAL location. Before 8.5, the backup-end time was read from the backup * and WAL location. Before 9.0, the backup-end time was read from the backup
* history file at the beginning of archive recovery, but we now use the WAL * history file at the beginning of archive recovery, but we now use the WAL
* record for that and the file is for informational and debug purposes only. * record for that and the file is for informational and debug purposes only.
* *

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/catalog/pg_largeobject.c,v 1.37 2010/01/07 02:41:16 rhaas Exp $ * $PostgreSQL: pgsql/src/backend/catalog/pg_largeobject.c,v 1.38 2010/02/17 04:19:39 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -191,7 +191,7 @@ LargeObjectAlterOwner(Oid loid, Oid newOwnerId)
/* /*
* lo_compat_privileges is not checked here, because ALTER * lo_compat_privileges is not checked here, because ALTER
* LARGE OBJECT ... OWNER did not exist at all prior to * LARGE OBJECT ... OWNER did not exist at all prior to
* PostgreSQL 8.5. * PostgreSQL 9.0.
* *
* We must be the owner of the existing object. * We must be the owner of the existing object.
*/ */

View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.116 2010/02/14 18:42:14 rhaas Exp $ * $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.117 2010/02/17 04:19:39 tgl Exp $
* *
* DESCRIPTION * DESCRIPTION
* These routines take the parse tree and pick out the * These routines take the parse tree and pick out the
@ -288,7 +288,7 @@ examine_parameter_list(List *parameters, Oid languageOid,
ListCell *px; ListCell *px;
/* /*
* As of Postgres 8.5 we disallow using the same name for two * As of Postgres 9.0 we disallow using the same name for two
* input or two output function parameters. Depending on the * input or two output function parameters. Depending on the
* function's language, conflicting input and output names might * function's language, conflicting input and output names might
* be bad too, but we leave it to the PL to complain if so. * be bad too, but we leave it to the PL to complain if so.

View File

@ -19,7 +19,7 @@
* Thus the full path to an arbitrary file is * Thus the full path to an arbitrary file is
* $PGDATA/pg_tblspc/spcoid/PG_MAJORVER_CATVER/dboid/relfilenode * $PGDATA/pg_tblspc/spcoid/PG_MAJORVER_CATVER/dboid/relfilenode
* e.g. * e.g.
* $PGDATA/pg_tblspc/20981/PG_8.5_201001061/719849/83292814 * $PGDATA/pg_tblspc/20981/PG_9.0_201002161/719849/83292814
* *
* There are two tablespaces created at initdb time: pg_global (for shared * There are two tablespaces created at initdb time: pg_global (for shared
* tables) and pg_default (for everything else). For backwards compatibility * tables) and pg_default (for everything else). For backwards compatibility
@ -40,7 +40,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.72 2010/01/14 11:08:01 sriggs Exp $ * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.73 2010/02/17 04:19:39 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */

View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.709 2010/02/16 22:34:49 tgl Exp $ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.710 2010/02/17 04:19:39 tgl Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -1997,7 +1997,7 @@ ClosePortalStmt:
* COPY ( SELECT ... ) TO file [WITH] [(options)] * COPY ( SELECT ... ) TO file [WITH] [(options)]
* *
* In the preferred syntax the options are comma-separated * In the preferred syntax the options are comma-separated
* and use generic identifiers instead of keywords. The pre-8.5 * and use generic identifiers instead of keywords. The pre-9.0
* syntax had a hard-wired, space-separated set of options. * syntax had a hard-wired, space-separated set of options.
* *
* Really old syntax, from versions 7.2 and prior: * Really old syntax, from versions 7.2 and prior:

View File

@ -2,7 +2,7 @@
* *
* walreceiver.c * walreceiver.c
* *
* The WAL receiver process (walreceiver) is new as of Postgres 8.5. It * The WAL receiver process (walreceiver) is new as of Postgres 9.0. It
* is the process in the standby server that takes charge of receiving * is the process in the standby server that takes charge of receiving
* XLOG records from a primary server during streaming replication. * XLOG records from a primary server during streaming replication.
* *
@ -29,7 +29,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.3 2010/02/03 09:47:19 heikki Exp $ * $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.4 2010/02/17 04:19:39 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */

View File

@ -2,7 +2,7 @@
* *
* walsender.c * walsender.c
* *
* The WAL sender process (walsender) is new as of Postgres 8.5. It takes * The WAL sender process (walsender) is new as of Postgres 9.0. It takes
* charge of XLOG streaming sender in the primary server. At first, it is * charge of XLOG streaming sender in the primary server. At first, it is
* started by the postmaster when the walreceiver in the standby server * started by the postmaster when the walreceiver in the standby server
* connects to the primary server and requests XLOG streaming replication, * connects to the primary server and requests XLOG streaming replication,
@ -30,7 +30,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.5 2010/02/03 09:47:19 heikki Exp $ * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.6 2010/02/17 04:19:39 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.306 2010/02/14 18:42:17 rhaas Exp $ * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.307 2010/02/17 04:19:39 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -3831,7 +3831,7 @@ RelationGetExclusionInfo(Relation indexRelation,
* relation descriptors using sequential scans and write 'em to * relation descriptors using sequential scans and write 'em to
* the initialization file for use by subsequent backends. * the initialization file for use by subsequent backends.
* *
* As of Postgres 8.5, there is one local initialization file in each * As of Postgres 9.0, there is one local initialization file in each
* database, plus one shared initialization file for shared catalogs. * database, plus one shared initialization file for shared catalogs.
* *
* We could dispense with the initialization files and just build the * We could dispense with the initialization files and just build the

View File

@ -42,7 +42,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.221 2010/01/02 16:57:56 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.222 2010/02/17 04:19:39 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2800,7 +2800,7 @@ is_log_level_output(int elevel, int log_min_level)
* else display as whatever level is set. It may still be shown, but only * else display as whatever level is set. It may still be shown, but only
* if log_min_messages is set lower than trace_recovery_messages. * if log_min_messages is set lower than trace_recovery_messages.
* *
* Intention is to keep this for at least the whole of the 8.5 production * Intention is to keep this for at least the whole of the 9.0 production
* release, so we can more easily diagnose production problems in the field. * release, so we can more easily diagnose production problems in the field.
*/ */
int int

View File

@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.540 2010/02/17 01:39:35 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.541 2010/02/17 04:19:40 tgl Exp $
* *
*-------------------------------------------------------------------- *--------------------------------------------------------------------
*/ */
@ -1247,7 +1247,7 @@ static struct config_bool ConfigureNamesBool[] =
{"lo_compat_privileges", PGC_SUSET, COMPAT_OPTIONS_PREVIOUS, {"lo_compat_privileges", PGC_SUSET, COMPAT_OPTIONS_PREVIOUS,
gettext_noop("Enables backward compatibility mode for privilege checks on large objects"), gettext_noop("Enables backward compatibility mode for privilege checks on large objects"),
gettext_noop("Skips privilege checks when reading or modifying large objects, " gettext_noop("Skips privilege checks when reading or modifying large objects, "
"for compatibility with PostgreSQL releases prior to 8.5.") "for compatibility with PostgreSQL releases prior to 9.0.")
}, },
&lo_compat_privileges, &lo_compat_privileges,
false, NULL, NULL false, NULL, NULL

View File

@ -5,7 +5,7 @@
* Implements the basic DB functions used by the archiver. * Implements the basic DB functions used by the archiver.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.86 2010/02/05 03:09:05 joe Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.87 2010/02/17 04:19:40 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -704,7 +704,7 @@ void
DropBlobIfExists(ArchiveHandle *AH, Oid oid) DropBlobIfExists(ArchiveHandle *AH, Oid oid)
{ {
/* Call lo_unlink only if exists to avoid not-found error. */ /* Call lo_unlink only if exists to avoid not-found error. */
if (PQserverVersion(AH->connection) >= 80500) if (PQserverVersion(AH->connection) >= 90000)
{ {
ahprintf(AH, "SELECT pg_catalog.lo_unlink(oid) " ahprintf(AH, "SELECT pg_catalog.lo_unlink(oid) "
"FROM pg_catalog.pg_largeobject_metadata " "FROM pg_catalog.pg_largeobject_metadata "

View File

@ -12,7 +12,7 @@
* by PostgreSQL * by PostgreSQL
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.570 2010/02/07 20:48:10 tgl Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.571 2010/02/17 04:19:40 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -604,7 +604,7 @@ main(int argc, char **argv)
* If supported, set extra_float_digits so that we can dump float data * If supported, set extra_float_digits so that we can dump float data
* exactly (given correctly implemented float I/O code, anyway) * exactly (given correctly implemented float I/O code, anyway)
*/ */
if (g_fout->remoteVersion >= 80500) if (g_fout->remoteVersion >= 90000)
do_sql_command(g_conn, "SET extra_float_digits TO 3"); do_sql_command(g_conn, "SET extra_float_digits TO 3");
else if (g_fout->remoteVersion >= 70400) else if (g_fout->remoteVersion >= 70400)
do_sql_command(g_conn, "SET extra_float_digits TO 2"); do_sql_command(g_conn, "SET extra_float_digits TO 2");
@ -1952,7 +1952,7 @@ hasBlobs(Archive *AH)
selectSourceSchema("pg_catalog"); selectSourceSchema("pg_catalog");
/* Check for BLOB OIDs */ /* Check for BLOB OIDs */
if (AH->remoteVersion >= 80500) if (AH->remoteVersion >= 90000)
blobQry = "SELECT oid FROM pg_largeobject_metadata LIMIT 1"; blobQry = "SELECT oid FROM pg_largeobject_metadata LIMIT 1";
else if (AH->remoteVersion >= 70100) else if (AH->remoteVersion >= 70100)
blobQry = "SELECT loid FROM pg_largeobject LIMIT 1"; blobQry = "SELECT loid FROM pg_largeobject LIMIT 1";
@ -1990,7 +1990,7 @@ dumpBlobs(Archive *AH, void *arg)
selectSourceSchema("pg_catalog"); selectSourceSchema("pg_catalog");
/* Cursor to get all BLOB OIDs */ /* Cursor to get all BLOB OIDs */
if (AH->remoteVersion >= 80500) if (AH->remoteVersion >= 90000)
blobQry = "DECLARE bloboid CURSOR FOR SELECT oid FROM pg_largeobject_metadata"; blobQry = "DECLARE bloboid CURSOR FOR SELECT oid FROM pg_largeobject_metadata";
else if (AH->remoteVersion >= 70100) else if (AH->remoteVersion >= 70100)
blobQry = "DECLARE bloboid CURSOR FOR SELECT DISTINCT loid FROM pg_largeobject"; blobQry = "DECLARE bloboid CURSOR FOR SELECT DISTINCT loid FROM pg_largeobject";
@ -2080,7 +2080,7 @@ dumpBlobComments(Archive *AH, void *arg)
selectSourceSchema("pg_catalog"); selectSourceSchema("pg_catalog");
/* Cursor to get all BLOB comments */ /* Cursor to get all BLOB comments */
if (AH->remoteVersion >= 80500) if (AH->remoteVersion >= 90000)
blobQry = "DECLARE blobcmt CURSOR FOR SELECT oid, " blobQry = "DECLARE blobcmt CURSOR FOR SELECT oid, "
"obj_description(oid, 'pg_largeobject'), " "obj_description(oid, 'pg_largeobject'), "
"pg_get_userbyid(lomowner), lomacl " "pg_get_userbyid(lomowner), lomacl "
@ -3472,7 +3472,7 @@ getTables(int *numTables)
* we cannot correctly identify inherited columns, owned sequences, etc. * we cannot correctly identify inherited columns, owned sequences, etc.
*/ */
if (g_fout->remoteVersion >= 80500) if (g_fout->remoteVersion >= 90000)
{ {
/* /*
* Left join to pick up dependency info linking sequences to their * Left join to pick up dependency info linking sequences to their
@ -3992,7 +3992,7 @@ getIndexes(TableInfo tblinfo[], int numTables)
* assume an index won't have more than one internal dependency. * assume an index won't have more than one internal dependency.
*/ */
resetPQExpBuffer(query); resetPQExpBuffer(query);
if (g_fout->remoteVersion >= 80500) if (g_fout->remoteVersion >= 90000)
{ {
appendPQExpBuffer(query, appendPQExpBuffer(query,
"SELECT t.tableoid, t.oid, " "SELECT t.tableoid, t.oid, "
@ -4622,7 +4622,7 @@ getTriggers(TableInfo tblinfo[], int numTables)
selectSourceSchema(tbinfo->dobj.namespace->dobj.name); selectSourceSchema(tbinfo->dobj.namespace->dobj.name);
resetPQExpBuffer(query); resetPQExpBuffer(query);
if (g_fout->remoteVersion >= 80500) if (g_fout->remoteVersion >= 90000)
{ {
/* /*
* NB: think not to use pretty=true in pg_get_triggerdef. It * NB: think not to use pretty=true in pg_get_triggerdef. It
@ -4831,7 +4831,7 @@ getProcLangs(int *numProcLangs)
/* Make sure we are in proper schema */ /* Make sure we are in proper schema */
selectSourceSchema("pg_catalog"); selectSourceSchema("pg_catalog");
if (g_fout->remoteVersion >= 80500) if (g_fout->remoteVersion >= 90000)
{ {
/* pg_language has a laninline column */ /* pg_language has a laninline column */
appendPQExpBuffer(query, "SELECT tableoid, oid, " appendPQExpBuffer(query, "SELECT tableoid, oid, "
@ -5154,9 +5154,9 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
resetPQExpBuffer(q); resetPQExpBuffer(q);
if (g_fout->remoteVersion >= 80500) if (g_fout->remoteVersion >= 90000)
{ {
/* attoptions is new in 8.5 */ /* attoptions is new in 9.0 */
appendPQExpBuffer(q, "SELECT a.attnum, a.attname, a.atttypmod, " appendPQExpBuffer(q, "SELECT a.attnum, a.attname, a.atttypmod, "
"a.attstattarget, a.attstorage, t.typstorage, " "a.attstattarget, a.attstorage, t.typstorage, "
"a.attnotnull, a.atthasdef, a.attisdropped, " "a.attnotnull, a.atthasdef, a.attisdropped, "
@ -6048,7 +6048,7 @@ getDefaultACLs(int *numDefaultACLs)
int i, int i,
ntups; ntups;
if (g_fout->remoteVersion < 80500) if (g_fout->remoteVersion < 90000)
{ {
*numDefaultACLs = 0; *numDefaultACLs = 0;
return NULL; return NULL;

View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* *
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.132 2010/02/05 03:09:05 joe Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.133 2010/02/17 04:19:40 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -507,7 +507,7 @@ main(int argc, char *argv[])
/* Dump role/database settings */ /* Dump role/database settings */
if (!tablespaces_only && !roles_only) if (!tablespaces_only && !roles_only)
{ {
if (server_version >= 80500) if (server_version >= 90000)
dumpDbRoleConfig(conn); dumpDbRoleConfig(conn);
} }
} }
@ -956,7 +956,7 @@ dumpTablespaces(PGconn *conn)
* Get all tablespaces except built-in ones (which we assume are named * Get all tablespaces except built-in ones (which we assume are named
* pg_xxx) * pg_xxx)
*/ */
if (server_version >= 80500) if (server_version >= 90000)
res = executeQuery(conn, "SELECT spcname, " res = executeQuery(conn, "SELECT spcname, "
"pg_catalog.pg_get_userbyid(spcowner) AS spcowner, " "pg_catalog.pg_get_userbyid(spcowner) AS spcowner, "
"spclocation, spcacl, " "spclocation, spcacl, "
@ -1348,14 +1348,14 @@ dumpDatabaseConfig(PGconn *conn, const char *dbname)
{ {
PGresult *res; PGresult *res;
if (server_version >= 80500) if (server_version >= 90000)
printfPQExpBuffer(buf, "SELECT setconfig[%d] FROM pg_db_role_setting WHERE " printfPQExpBuffer(buf, "SELECT setconfig[%d] FROM pg_db_role_setting WHERE "
"setrole = 0 AND setdatabase = (SELECT oid FROM pg_database WHERE datname = ", count); "setrole = 0 AND setdatabase = (SELECT oid FROM pg_database WHERE datname = ", count);
else else
printfPQExpBuffer(buf, "SELECT datconfig[%d] FROM pg_database WHERE datname = ", count); printfPQExpBuffer(buf, "SELECT datconfig[%d] FROM pg_database WHERE datname = ", count);
appendStringLiteralConn(buf, dbname, conn); appendStringLiteralConn(buf, dbname, conn);
if (server_version >= 80500) if (server_version >= 90000)
appendPQExpBuffer(buf, ")"); appendPQExpBuffer(buf, ")");
appendPQExpBuffer(buf, ";"); appendPQExpBuffer(buf, ";");
@ -1394,7 +1394,7 @@ dumpUserConfig(PGconn *conn, const char *username)
{ {
PGresult *res; PGresult *res;
if (server_version >= 80500) if (server_version >= 90000)
printfPQExpBuffer(buf, "SELECT setconfig[%d] FROM pg_db_role_setting WHERE " printfPQExpBuffer(buf, "SELECT setconfig[%d] FROM pg_db_role_setting WHERE "
"setdatabase = 0 AND setrole = " "setdatabase = 0 AND setrole = "
"(SELECT oid FROM pg_authid WHERE rolname = ", count); "(SELECT oid FROM pg_authid WHERE rolname = ", count);
@ -1403,7 +1403,7 @@ dumpUserConfig(PGconn *conn, const char *username)
else else
printfPQExpBuffer(buf, "SELECT useconfig[%d] FROM pg_shadow WHERE usename = ", count); printfPQExpBuffer(buf, "SELECT useconfig[%d] FROM pg_shadow WHERE usename = ", count);
appendStringLiteralConn(buf, username, conn); appendStringLiteralConn(buf, username, conn);
if (server_version >= 80500) if (server_version >= 90000)
appendPQExpBuffer(buf, ")"); appendPQExpBuffer(buf, ")");
res = executeQuery(conn, buf->data); res = executeQuery(conn, buf->data);

View File

@ -8,7 +8,7 @@
* *
* Copyright (c) 2000-2010, PostgreSQL Global Development Group * Copyright (c) 2000-2010, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.236 2010/01/28 23:21:12 petere Exp $ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.237 2010/02/17 04:19:40 tgl Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
@ -745,7 +745,7 @@ listDefaultACLs(const char *pattern)
printQueryOpt myopt = pset.popt; printQueryOpt myopt = pset.popt;
static const bool translate_columns[] = {false, false, true, false}; static const bool translate_columns[] = {false, false, true, false};
if (pset.sversion < 80500) if (pset.sversion < 90000)
{ {
fprintf(stderr, _("The server (version %d.%d) does not support altering default privileges.\n"), fprintf(stderr, _("The server (version %d.%d) does not support altering default privileges.\n"),
pset.sversion / 10000, (pset.sversion / 100) % 100); pset.sversion / 10000, (pset.sversion / 100) % 100);
@ -1123,7 +1123,7 @@ describeOneTableDetails(const char *schemaname,
initPQExpBuffer(&tmpbuf); initPQExpBuffer(&tmpbuf);
/* Get general table info */ /* Get general table info */
if (pset.sversion >= 80500) if (pset.sversion >= 90000)
{ {
printfPQExpBuffer(&buf, printfPQExpBuffer(&buf,
"SELECT c.relchecks, c.relkind, c.relhasindex, c.relhasrules, " "SELECT c.relchecks, c.relkind, c.relhasindex, c.relhasrules, "
@ -1207,9 +1207,9 @@ describeOneTableDetails(const char *schemaname,
strdup(PQgetvalue(res, 0, 6)) : 0; strdup(PQgetvalue(res, 0, 6)) : 0;
tableinfo.tablespace = (pset.sversion >= 80000) ? tableinfo.tablespace = (pset.sversion >= 80000) ?
atooid(PQgetvalue(res, 0, 7)) : 0; atooid(PQgetvalue(res, 0, 7)) : 0;
tableinfo.hasexclusion = (pset.sversion >= 80500) ? tableinfo.hasexclusion = (pset.sversion >= 90000) ?
strcmp(PQgetvalue(res, 0, 8), "t") == 0 : false; strcmp(PQgetvalue(res, 0, 8), "t") == 0 : false;
tableinfo.reloftype = (pset.sversion >= 80500 && strcmp(PQgetvalue(res, 0, 9), "") != 0) ? tableinfo.reloftype = (pset.sversion >= 90000 && strcmp(PQgetvalue(res, 0, 9), "") != 0) ?
strdup(PQgetvalue(res, 0, 9)) : 0; strdup(PQgetvalue(res, 0, 9)) : 0;
PQclear(res); PQclear(res);
res = NULL; res = NULL;
@ -1413,7 +1413,7 @@ describeOneTableDetails(const char *schemaname,
appendPQExpBuffer(&buf, "i.indisvalid,\n"); appendPQExpBuffer(&buf, "i.indisvalid,\n");
else else
appendPQExpBuffer(&buf, "true AS indisvalid,\n"); appendPQExpBuffer(&buf, "true AS indisvalid,\n");
if (pset.sversion >= 80500) if (pset.sversion >= 90000)
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
" (NOT i.indimmediate) AND " " (NOT i.indimmediate) AND "
"EXISTS (SELECT 1 FROM pg_catalog.pg_depend d, " "EXISTS (SELECT 1 FROM pg_catalog.pg_depend d, "
@ -1549,7 +1549,7 @@ describeOneTableDetails(const char *schemaname,
else else
appendPQExpBuffer(&buf, "true as indisvalid, "); appendPQExpBuffer(&buf, "true as indisvalid, ");
appendPQExpBuffer(&buf, "pg_catalog.pg_get_indexdef(i.indexrelid, 0, true)"); appendPQExpBuffer(&buf, "pg_catalog.pg_get_indexdef(i.indexrelid, 0, true)");
if (pset.sversion >= 80500) if (pset.sversion >= 90000)
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
",\n (NOT i.indimmediate) AND " ",\n (NOT i.indimmediate) AND "
"EXISTS (SELECT 1 FROM pg_catalog.pg_depend d, " "EXISTS (SELECT 1 FROM pg_catalog.pg_depend d, "
@ -1862,9 +1862,9 @@ describeOneTableDetails(const char *schemaname,
"t.tgenabled\n" "t.tgenabled\n"
"FROM pg_catalog.pg_trigger t\n" "FROM pg_catalog.pg_trigger t\n"
"WHERE t.tgrelid = '%s' AND ", "WHERE t.tgrelid = '%s' AND ",
(pset.sversion >= 80500 ? ", true" : ""), (pset.sversion >= 90000 ? ", true" : ""),
oid); oid);
if (pset.sversion >= 80500) if (pset.sversion >= 90000)
appendPQExpBuffer(&buf, "NOT t.tgisinternal"); appendPQExpBuffer(&buf, "NOT t.tgisinternal");
else if (pset.sversion >= 80300) else if (pset.sversion >= 80300)
appendPQExpBuffer(&buf, "t.tgconstraint = 0"); appendPQExpBuffer(&buf, "t.tgconstraint = 0");
@ -2319,7 +2319,7 @@ listDbRoleSettings(const char *pattern, const char *pattern2)
initPQExpBuffer(&buf); initPQExpBuffer(&buf);
if (pset.sversion >= 80500) if (pset.sversion >= 90000)
{ {
bool havewhere; bool havewhere;

View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2010, PostgreSQL Global Development Group * Copyright (c) 2000-2010, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/large_obj.c,v 1.54 2010/01/02 16:57:59 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/large_obj.c,v 1.55 2010/02/17 04:19:40 tgl Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "large_obj.h" #include "large_obj.h"
@ -278,7 +278,7 @@ do_lo_list(void)
char buf[1024]; char buf[1024];
printQueryOpt myopt = pset.popt; printQueryOpt myopt = pset.popt;
if (pset.sversion >= 80500) if (pset.sversion >= 90000)
{ {
snprintf(buf, sizeof(buf), snprintf(buf, sizeof(buf),
"SELECT oid as \"%s\",\n" "SELECT oid as \"%s\",\n"

View File

@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.34 2010/02/08 04:33:54 tgl Exp $ * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.35 2010/02/17 04:19:40 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -227,7 +227,7 @@ vacuum_one_database(const char *dbname, bool full, bool verbose, bool and_analyz
else else
{ {
appendPQExpBuffer(&sql, "VACUUM"); appendPQExpBuffer(&sql, "VACUUM");
if (PQserverVersion(conn) >= 80500) if (PQserverVersion(conn) >= 90000)
{ {
const char *paren = " ("; const char *paren = " (";
const char *comma = ", "; const char *comma = ", ";

View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.49 2010/01/20 19:43:40 heikki Exp $ * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.50 2010/02/17 04:19:40 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -21,7 +21,7 @@
/* Version identifier for this pg_control format */ /* Version identifier for this pg_control format */
#define PG_CONTROL_VERSION 853 #define PG_CONTROL_VERSION 901
/* /*
* Body of CheckPoint XLOG records. This is declared here because we keep * Body of CheckPoint XLOG records. This is declared here because we keep

View File

@ -10,7 +10,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.154 2010/01/02 16:58:04 momjian Exp $ * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.155 2010/02/17 04:19:40 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -211,7 +211,7 @@ typedef struct Param
* Aggref * Aggref
* *
* The aggregate's args list is a targetlist, ie, a list of TargetEntry nodes * The aggregate's args list is a targetlist, ie, a list of TargetEntry nodes
* (before Postgres 8.5 it was just bare expressions). The non-resjunk TLEs * (before Postgres 9.0 it was just bare expressions). The non-resjunk TLEs
* represent the aggregate's regular arguments (if any) and resjunk TLEs can * represent the aggregate's regular arguments (if any) and resjunk TLEs can
* be added at the end to represent ORDER BY expressions that are not also * be added at the end to represent ORDER BY expressions that are not also
* arguments. As in a top-level Query, the TLEs can be marked with * arguments. As in a top-level Query, the TLEs can be marked with

View File

@ -560,16 +560,16 @@
#define PACKAGE_NAME "PostgreSQL" #define PACKAGE_NAME "PostgreSQL"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "PostgreSQL 8.5devel" #define PACKAGE_STRING "PostgreSQL 9.0devel"
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "8.5devel" #define PACKAGE_VERSION "9.0devel"
/* PostgreSQL version as a string */ /* PostgreSQL version as a string */
#define PG_VERSION "8.5devel" #define PG_VERSION "9.0devel"
/* PostgreSQL version as a number */ /* PostgreSQL version as a number */
#define PG_VERSION_NUM 80500 #define PG_VERSION_NUM 90000
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "postgresql" #define PACKAGE_TARNAME "postgresql"

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.386 2010/02/05 03:09:05 joe Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.387 2010/02/17 04:19:41 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -84,7 +84,7 @@ static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
#endif #endif
/* /*
* Pre-8.5 servers will return this SQLSTATE if asked to set * Pre-9.0 servers will return this SQLSTATE if asked to set
* application_name in a startup packet. We hard-wire the value rather * application_name in a startup packet. We hard-wire the value rather
* than looking into errcodes.h since it reflects historical behavior * than looking into errcodes.h since it reflects historical behavior
* rather than that of the current code. * rather than that of the current code.
@ -2033,7 +2033,7 @@ keep_going: /* We will come back to here until there is
{ {
/* /*
* If we tried to send application_name, check to see * If we tried to send application_name, check to see
* if the error is about that --- pre-8.5 servers will * if the error is about that --- pre-9.0 servers will
* reject it at this stage of the process. If so, * reject it at this stage of the process. If so,
* close the connection and retry without sending * close the connection and retry without sending
* application_name. We could possibly get a false * application_name. We could possibly get a false

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.209 2010/02/16 20:58:14 momjian Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.210 2010/02/17 04:19:41 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -3345,7 +3345,7 @@ PQescapeByteaConn(PGconn *conn,
return NULL; return NULL;
return PQescapeByteaInternal(conn, from, from_length, to_length, return PQescapeByteaInternal(conn, from, from_length, to_length,
conn->std_strings, conn->std_strings,
(conn->sversion >= 80500)); (conn->sversion >= 90000));
} }
unsigned char * unsigned char *

View File

@ -1,8 +1,8 @@
#include <winver.h> #include <winver.h>
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 8,5,0,0 FILEVERSION 9,0,0,0
PRODUCTVERSION 8,5,0,0 PRODUCTVERSION 9,0,0,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
FILEFLAGS 0 FILEFLAGS 0
FILEOS VOS__WINDOWS32 FILEOS VOS__WINDOWS32
@ -15,13 +15,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "\0" VALUE "CompanyName", "\0"
VALUE "FileDescription", "PostgreSQL Access Library\0" VALUE "FileDescription", "PostgreSQL Access Library\0"
VALUE "FileVersion", "8.5.0\0" VALUE "FileVersion", "9.0.0\0"
VALUE "InternalName", "libpq\0" VALUE "InternalName", "libpq\0"
VALUE "LegalCopyright", "Copyright (C) 2010\0" VALUE "LegalCopyright", "Copyright (C) 2010\0"
VALUE "LegalTrademarks", "\0" VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libpq.dll\0" VALUE "OriginalFilename", "libpq.dll\0"
VALUE "ProductName", "PostgreSQL\0" VALUE "ProductName", "PostgreSQL\0"
VALUE "ProductVersion", "8.5.0\0" VALUE "ProductVersion", "9.0.0\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

View File

@ -2,8 +2,8 @@
#include "pg_config.h" #include "pg_config.h"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 8,5,0,0 FILEVERSION 9,0,0,0
PRODUCTVERSION 8,5,0,0 PRODUCTVERSION 9,0,0,0
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
FILEFLAGS 0x0L FILEFLAGS 0x0L
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32

View File

@ -195,7 +195,7 @@ COPY y TO stdout WITH CSV FORCE QUOTE *;
"Jackson, Sam","\h" "Jackson, Sam","\h"
"It is ""perfect""."," " "It is ""perfect""."," "
"", "",
-- Repeat above tests with new 8.5 option syntax -- Repeat above tests with new 9.0 option syntax
COPY y TO stdout (FORMAT CSV); COPY y TO stdout (FORMAT CSV);
"Jackson, Sam",\h "Jackson, Sam",\h
"It is ""perfect"".", "It is ""perfect"".",

View File

@ -130,7 +130,7 @@ COPY y TO stdout WITH CSV QUOTE '''' DELIMITER '|';
COPY y TO stdout WITH CSV FORCE QUOTE col2 ESCAPE E'\\'; COPY y TO stdout WITH CSV FORCE QUOTE col2 ESCAPE E'\\';
COPY y TO stdout WITH CSV FORCE QUOTE *; COPY y TO stdout WITH CSV FORCE QUOTE *;
-- Repeat above tests with new 8.5 option syntax -- Repeat above tests with new 9.0 option syntax
COPY y TO stdout (FORMAT CSV); COPY y TO stdout (FORMAT CSV);
COPY y TO stdout (FORMAT CSV, QUOTE '''', DELIMITER '|'); COPY y TO stdout (FORMAT CSV, QUOTE '''', DELIMITER '|');

View File

@ -5,7 +5,7 @@
# #
# Copyright (c) 2008-2010, PostgreSQL Global Development Group # Copyright (c) 2008-2010, PostgreSQL Global Development Group
# #
# $PostgreSQL: pgsql/src/tools/version_stamp.pl,v 1.5 2010/01/02 16:58:16 momjian Exp $ # $PostgreSQL: pgsql/src/tools/version_stamp.pl,v 1.6 2010/02/17 04:19:41 tgl Exp $
################################################################# #################################################################
# #
@ -22,8 +22,8 @@
# Major version is hard-wired into the script. We update it when we branch # Major version is hard-wired into the script. We update it when we branch
# a new development version. # a new development version.
$major1 = 8; $major1 = 9;
$major2 = 5; $major2 = 0;
# Validate argument and compute derived variables # Validate argument and compute derived variables
$minor = shift; $minor = shift;