git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/configure b/configure

index c0ca7bc45744dddb8e44c47a48a1ba4672da4dc8..f5a93251fb6c3a9989791e65faaf940853847e61 100755 (executable)

--- a/configure

+++ b/configure

#! /bin/sh

# 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>.

#

# Identity of this package.

PACKAGE_NAME='PostgreSQL'

PACKAGE_TARNAME='postgresql'

-PACKAGE_VERSION='8.5devel'

-PACKAGE_STRING='PostgreSQL 8.5devel'

+PACKAGE_VERSION='9.0devel'

+PACKAGE_STRING='PostgreSQL 9.0devel'

PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'

ac_unique_file="src/backend/access/common/heaptuple.c"

# 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.

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]...

if test -n "$ac_init_help"; then

case $ac_init_help in

- short | recursive ) echo "Configuration of PostgreSQL 8.5devel:";;

+ short | recursive ) echo "Configuration of PostgreSQL 9.0devel:";;

esac

cat <<\_ACEOF

test -n "$ac_init_help" && exit $ac_status

if $ac_init_version; then

cat <<\_ACEOF

-PostgreSQL configure 8.5devel

+PostgreSQL configure 9.0devel

generated by GNU Autoconf 2.63

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

This file contains any messages produced by compilers while

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

$ 0ドル $@

# report actual input values of CONFIG_FILES etc. instead of their

# values after options handling.

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

CONFIG_FILES = $CONFIG_FILES

_ACEOF

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

ac_cs_version="\\

-PostgreSQL config.status 8.5devel

+PostgreSQL config.status 9.0devel

configured by 0,ドル generated by GNU Autoconf 2.63,

with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

diff --git a/configure.in b/configure.in

index 6955edbea0480bfe1a9da6445381fe3d407ec0e9..c442e261b6c34468c167450c1467b16c8e9fcc50 100644 (file)

--- a/configure.in

+++ b/configure.in

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 Developers, please strive to achieve this order:

dnl

dnl

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.

Untested combinations of 'autoconf' and PostgreSQL versions are not

diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c

index be527f10de17b05316f12fbfda54a3a9ccfa24ea..2ed1cbeb93686baec9ad126d42086b21f713e314 100644 (file)

--- a/contrib/vacuumlo/vacuumlo.c

+++ b/contrib/vacuumlo/vacuumlo.c

*

*

* 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 $

*

*-------------------------------------------------------------------------

*/

*/

buf[0] = '0円';

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");

else

strcat(buf, "SELECT DISTINCT loid AS lo FROM pg_largeobject");

diff --git a/doc/bug.template b/doc/bug.template

index 1b65f62c06789c6b3942edd34393e83db2afc68c..9cb4f2d53fcdc8f08209655aaebdc89d305bdf0a 100644 (file)

--- a/doc/bug.template

+++ b/doc/bug.template

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

diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml

index e5bef18d7d8f82768dec52f85a83293d5fb1a95c..197b782021933c7ad7723b9c6ab9afe03cefd1cd 100644 (file)

--- a/doc/src/sgml/catalogs.sgml

+++ b/doc/src/sgml/catalogs.sgml

-<!-- $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

-->

</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,

<structname>pg_largeobject</structname> was publicly readable and could be

used to obtain the OIDs (and contents) of all large objects in the system.

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml

index 6c1c047c7b8249280189bc7e9a65620e0ed9ba77..4d7119fed260816827bce1648fb5b32f457f1772 100644 (file)

--- a/doc/src/sgml/config.sgml

+++ b/doc/src/sgml/config.sgml

-<!-- $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">

<title>Server Configuration</title>

</indexterm>

<listitem>

<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

writable by all users. Setting this variable to <literal>on</>

disables the new privilege checks, for compatibility with prior

</para>

<para>

Setting this variable does not disable all security checks for

- large objects - only those for which the default behavior has changed

- in <productname>PostgreSQL</> 8.5.

+ large objects &mdash; only those for which the default behavior has

+ changed in <productname>PostgreSQL</> 9.0.

For example, <literal>lo_import()</literal> and

<literal>lo_export()</literal> need superuser privileges independent

of this setting.

diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml

index abe747a6964729f7ec4c063bf98d305d41f7240c..215a4dbab147fd56a8e0bb47be13a03aaacf4f2b 100644 (file)

--- a/doc/src/sgml/datatype.sgml

+++ b/doc/src/sgml/datatype.sgml

-<!-- $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">

<title id="datatype-title">Data Types</title>

of these are always accepted on input. The output format depends

on the configuration parameter <xref linkend="guc-bytea-output">;

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

</para>

diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml

index bfd0676cd1b2dab1d7870bddb02ccf158c8991ce..eb94a41d8a2a6b9ac01c7322c7e4dafc48f983e0 100644 (file)

--- a/doc/src/sgml/ecpg.sgml

+++ b/doc/src/sgml/ecpg.sgml

-<!-- $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">

<title><application>ECPG</application> - Embedded <acronym>SQL</acronym> in C</title>

</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>

produced named SQL Descriptor Areas. Now it is mandatory, omitting

the <literal>SQL</literal> keyword produces SQLDA Descriptor Areas,

diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml

index 2ceee79cb98f14f2f970524df343d02c66e49d2f..732c41fb7b32938e3f23772ef0ed2502f39e8676 100644 (file)

--- a/doc/src/sgml/filelist.sgml

+++ b/doc/src/sgml/filelist.sgml

-<!-- $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 info SYSTEM "info.sgml">

<!entity keywords SYSTEM "keywords.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.3 SYSTEM "release-8.3.sgml">

<!entity release-8.2 SYSTEM "release-8.2.sgml">

diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml

index 2c0c91e15b426e829ee80dd0f9893c01755b9ab3..e868e232d6cd3d614c530156e5410bd1c15a5b46 100644 (file)

--- a/doc/src/sgml/high-availability.sgml

+++ b/doc/src/sgml/high-availability.sgml

-<!-- $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">

<title>High Availability, Load Balancing, and Replication</title>

</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

achieve the same with less effort.

</para>

diff --git a/doc/src/sgml/hstore.sgml b/doc/src/sgml/hstore.sgml

index ed707d219142427ac5df2a2d08257b3048d76ba4..958a6b9d160ab1ce8436dfa495866280c13a6957 100644 (file)

--- a/doc/src/sgml/hstore.sgml

+++ b/doc/src/sgml/hstore.sgml

-<!-- $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">

<title>hstore</title>

</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

dump/restore upgrades since the text representation (used in the dump) is

unchanged.

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml

index 0bdb6401c34b5119e48d0367ba7bdd3b215ae748..6ab8969fc8b66b6342f0f86e5aba0ff04d1015e9 100644 (file)

--- a/doc/src/sgml/libpq.sgml

+++ b/doc/src/sgml/libpq.sgml

-<!-- $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">

<title><application>libpq</application> - C Library</title>

<literal>standard_conforming_strings</> was not reported by releases

before 8.1;

<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

<literal>server_version</>,

<literal>server_encoding</> and

diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml

index 90319c47feef9d445683cb4a48b381d61aa1a806..0e567e7dbcd78295b7bce82940398c6cc50af40a 100644 (file)

--- a/doc/src/sgml/lobj.sgml

+++ b/doc/src/sgml/lobj.sgml

-<!-- $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">

<title id="largeObjects-title">Large Objects</title>

</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

<xref linkend="sql-grant" endterm="sql-grant-title"> and

<xref linkend="sql-revoke" endterm="sql-revoke-title">.

diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml

index af8e372fe83facc16bfd8b06e963ffdd78f23a7b..b682db80bc02b2a75e58e2d1f6b3215e818752bc 100644 (file)

--- a/doc/src/sgml/plpgsql.sgml

+++ b/doc/src/sgml/plpgsql.sgml

-<!-- $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">

<title><application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language</title>

</para>

<para>

- In <productname>PostgreSQL</> 8.5 and later,

+ In <productname>PostgreSQL</> 9.0 and later,

<application>PL/pgSQL</application> is installed by default.

However it is still a loadable module, so especially security-conscious

administrators could choose to remove it.

<note>

<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.

</para>

</note>

large body of <application>PL/pgSQL</> code. In such cases you can

specify that <application>PL/pgSQL</> should resolve ambiguous references

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

<productname>Oracle</productname>).

</para>

diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml

index f0a2aeba03ad70a8ece535d1146f8cba43b428fc..e30ca0d9299c37f1d7a7ba46c6fc1c379b98e93f 100644 (file)

--- a/doc/src/sgml/protocol.sgml

+++ b/doc/src/sgml/protocol.sgml

-<!-- $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">

<title>Frontend/Backend Protocol</title>

<literal>standard_conforming_strings</> was not reported by releases

before 8.1;

<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

<literal>server_version</>,

<literal>server_encoding</> and

diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml

index 57a0a6e5f191070500ebf94a833db36284df9a87..ae6e250e46e36b6ae492249c86d69b240248411b 100644 (file)

--- a/doc/src/sgml/ref/copy.sgml

+++ b/doc/src/sgml/ref/copy.sgml

<!--

-$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

-->

<para>

The following syntax was used before <productname>PostgreSQL</>

- version 8.5 and is still supported:

+ version 9.0 and is still supported:

<synopsis>

COPY <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ]

diff --git a/doc/src/sgml/ref/explain.sgml b/doc/src/sgml/ref/explain.sgml

index 2f6aaf427a82d01f2510007518c87a9d3316c8ac..c28c5174000a4b8162d4f26e6e39679088db27a8 100644 (file)

--- a/doc/src/sgml/ref/explain.sgml

+++ b/doc/src/sgml/ref/explain.sgml

<!--

-$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

-->

<para>

Only the <literal>ANALYZE</literal> and <literal>VERBOSE</literal> options

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

all new options will be supported only in the parenthesized syntax.

</para>

diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml

index 64b6f5e23e614c70d5caabc6886329d12941009f..bd2b6726c445e73da8590eaa4f748be66651dc99 100644 (file)

--- a/doc/src/sgml/ref/vacuum.sgml

+++ b/doc/src/sgml/ref/vacuum.sgml

<!--

-$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

-->

When the option list is surrounded by parentheses, the options can be

written in any order. Without parentheses, options must be specified

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

will be supported only in the parenthesized syntax.

</para>

diff --git a/doc/src/sgml/release-8.5.sgml b/doc/src/sgml/release-9.0.sgml

similarity index 99%
rename from doc/src/sgml/release-8.5.sgml
rename to doc/src/sgml/release-9.0.sgml
index 4e247a381150c6d659b88b3442b1d9153528f39f..a9e0b1f97b2d2fb91967a567c4d5e50bc9fadce9 100644 (file)

--- a/doc/src/sgml/release-8.5.sgml

+++ b/doc/src/sgml/release-9.0.sgml

-<!-- $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">

- <title>Release 8.5alpha3</title>

+<sect1 id="release-9-0">

+ <title>Release 9.0alpha3</title>

<sect2>

<title>Overview</title>

<para>

diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml

index 70f31f0de4752481c17bbdff3a3b58525e495f60..cc3b3e7a7383bb3f0264e5d226e20e654db72e6a 100644 (file)

--- a/doc/src/sgml/release.sgml

+++ b/doc/src/sgml/release.sgml

-<!-- $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:

The reason for splitting the release notes this way is so that appropriate

subsets can easily be copied into back branches.

-->

-&release-8.5;

+&release-9.0;

&release-8.4;

&release-8.3;

&release-8.2;

diff --git a/doc/src/sgml/stylesheet-man.xsl b/doc/src/sgml/stylesheet-man.xsl

index 842a9bd50399ec297d3aedd226a1b47a72d098d1..888f9d416c7df67e1169a4750772a43ec1562886 100644 (file)

--- a/doc/src/sgml/stylesheet-man.xsl

+++ b/doc/src/sgml/stylesheet-man.xsl

<xsl:param name="man.output.base.dir"></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="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 -->

<!-- Fixup for apostrophe groff output. See the following references:

diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c

index 46a842bb9a8e708f17d02d9abc47a91a845d0e1c..2c32723be62a06f829b11101efed1a9b9eb45a7f 100644 (file)

--- a/src/backend/access/transam/xact.c

+++ b/src/backend/access/transam/xact.c

*

*

* 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 $

*

*-------------------------------------------------------------------------

*/

*/

/*

- * 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.

*/

static void

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c

index 3c1b077c5afda1a5a93293aaa69588a8770b16cc..31f50ecb5025db6617d2a6f5c5cebc57b391fb59 100644 (file)

--- a/src/backend/access/transam/xlog.c

+++ b/src/backend/access/transam/xlog.c

* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group

* 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 $

*

*-------------------------------------------------------------------------

*/

* created by pg_start_backup, creating a backup history file in pg_xlog

* 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

- * 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

* record for that and the file is for informational and debug purposes only.

*

diff --git a/src/backend/catalog/pg_largeobject.c b/src/backend/catalog/pg_largeobject.c

index d27b20ede331cc1cf114dfe2ea85851fca17cfaa..500a6c9bae664dcc84eb1d8778ebbbdbc2cc1380 100644 (file)

--- a/src/backend/catalog/pg_largeobject.c

+++ b/src/backend/catalog/pg_largeobject.c

*

*

* 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 $

*

*-------------------------------------------------------------------------

*/

/*

* lo_compat_privileges is not checked here, because ALTER

* 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.

*/

diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c

index 0a9920097b60c7c944715cd18bbe7a17678b8051..3de1a9b0caa51c51d029ee6c4a99e3da6772debf 100644 (file)

--- a/src/backend/commands/functioncmds.c

+++ b/src/backend/commands/functioncmds.c

*

*

* 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

* These routines take the parse tree and pick out the

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

* function's language, conflicting input and output names might

* be bad too, but we leave it to the PL to complain if so.

diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c

index 2ff3835ab0f370d3e94efd2044ff8b4fdb13969d..32c061279122bc1999e7ecdf402de6a127b3d926 100644 (file)

--- a/src/backend/commands/tablespace.c

+++ b/src/backend/commands/tablespace.c

* Thus the full path to an arbitrary file is

* $PGDATA/pg_tblspc/spcoid/PG_MAJORVER_CATVER/dboid/relfilenode

* 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

* tables) and pg_default (for everything else). For backwards compatibility

*

*

* 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 $

*

*-------------------------------------------------------------------------

*/

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y

index 235a7001adf3b240f6de6445bbf8c026b0211bc9..94b28bf3d89b2f3a7a4ff75534ed648fc0098ce5 100644 (file)

--- a/src/backend/parser/gram.y

+++ b/src/backend/parser/gram.y

*

*

* 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

* AUTHOR DATE MAJOR EVENT

* COPY ( SELECT ... ) TO file [WITH] [(options)]

*

* 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.

*

* Really old syntax, from versions 7.2 and prior:

diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c

index a2f15a9a03e50c6082c9a22ed3d469dcbad35d96..0e57611da4252dfe6f7aca090428b78a2c4e65ca 100644 (file)

--- a/src/backend/replication/walreceiver.c

+++ b/src/backend/replication/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

* XLOG records from a primary server during streaming replication.

*

*

*

* 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 $

*

*-------------------------------------------------------------------------

*/

diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c

index 0115b70fa2a20fb50c77914c51a4fb4bfc2b07a6..eb9a5425a2ef00e21a47b57fc87aaf32e5ff0727 100644 (file)

--- a/src/backend/replication/walsender.c

+++ b/src/backend/replication/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

* started by the postmaster when the walreceiver in the standby server

* connects to the primary server and requests XLOG streaming replication,

*

*

* 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 $

*

*-------------------------------------------------------------------------

*/

diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c

index cc62c4fb7c460feb0b8952421e520bdc69f7c9d6..f015f5b842b704f77362b77bc57632142f33a551 100644 (file)

--- a/src/backend/utils/cache/relcache.c

+++ b/src/backend/utils/cache/relcache.c

*

*

* 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 $

*

*-------------------------------------------------------------------------

*/

* relation descriptors using sequential scans and write 'em to

* 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.

*

* We could dispense with the initialization files and just build the

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c

index d4e775b57cd7fd09a8b1199a4e4107e066c5926e..a689e302429e1387d99792b9edacbe12eb4abb25 100644 (file)

--- a/src/backend/utils/error/elog.c

+++ b/src/backend/utils/error/elog.c

*

*

* 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 $

*

*-------------------------------------------------------------------------

*/

* 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.

*

- * 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.

*/

int

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c

index fbdfa8f0523dc18d4d6f5a2cf902e1d8ab58098f..bde3be91cf3548e7995d3aab8329abda2cd77bf0 100644 (file)

--- a/src/backend/utils/misc/guc.c

+++ b/src/backend/utils/misc/guc.c

* Written by Peter Eisentraut <peter_e@gmx.net>.

*

* 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 $

*

*--------------------------------------------------------------------

*/

{"lo_compat_privileges", PGC_SUSET, COMPAT_OPTIONS_PREVIOUS,

gettext_noop("Enables backward compatibility mode for privilege checks on 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,

false, NULL, NULL

diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c

index 4aa10135bb06ea7e64a08164b9205cb390aa6328..53711de11912a489a6375678bdf3a8e8f53900bc 100644 (file)

--- a/src/bin/pg_dump/pg_backup_db.c

+++ b/src/bin/pg_dump/pg_backup_db.c

* Implements the basic DB functions used by the archiver.

*

* 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 $

*

*-------------------------------------------------------------------------

*/

DropBlobIfExists(ArchiveHandle *AH, Oid oid)

{

/* 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) "

"FROM pg_catalog.pg_largeobject_metadata "

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c

index 538a518ef555a1219c1a46f686ef7e3ed0463b48..ace4ffe34bb298c846a18d7be755daf86a2e88fd 100644 (file)

--- a/src/bin/pg_dump/pg_dump.c

+++ b/src/bin/pg_dump/pg_dump.c

* by PostgreSQL

*

* 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 $

*

*-------------------------------------------------------------------------

*/

* If supported, set extra_float_digits so that we can dump float data

* 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");

else if (g_fout->remoteVersion >= 70400)

do_sql_command(g_conn, "SET extra_float_digits TO 2");

selectSourceSchema("pg_catalog");

/* Check for BLOB OIDs */

- if (AH->remoteVersion >= 80500)

+ if (AH->remoteVersion >= 90000)

blobQry = "SELECT oid FROM pg_largeobject_metadata LIMIT 1";

else if (AH->remoteVersion >= 70100)

blobQry = "SELECT loid FROM pg_largeobject LIMIT 1";

selectSourceSchema("pg_catalog");

/* 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";

else if (AH->remoteVersion >= 70100)

blobQry = "DECLARE bloboid CURSOR FOR SELECT DISTINCT loid FROM pg_largeobject";

selectSourceSchema("pg_catalog");

/* Cursor to get all BLOB comments */

- if (AH->remoteVersion >= 80500)

+ if (AH->remoteVersion >= 90000)

blobQry = "DECLARE blobcmt CURSOR FOR SELECT oid, "

"obj_description(oid, 'pg_largeobject'), "

"pg_get_userbyid(lomowner), lomacl "

* 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

* assume an index won't have more than one internal dependency.

*/

resetPQExpBuffer(query);

- if (g_fout->remoteVersion >= 80500)

+ if (g_fout->remoteVersion >= 90000)

{

appendPQExpBuffer(query,

"SELECT t.tableoid, t.oid, "

selectSourceSchema(tbinfo->dobj.namespace->dobj.name);

resetPQExpBuffer(query);

- if (g_fout->remoteVersion >= 80500)

+ if (g_fout->remoteVersion >= 90000)

{

/*

* NB: think not to use pretty=true in pg_get_triggerdef. It

/* Make sure we are in proper schema */

selectSourceSchema("pg_catalog");

- if (g_fout->remoteVersion >= 80500)

+ if (g_fout->remoteVersion >= 90000)

{

/* pg_language has a laninline column */

appendPQExpBuffer(query, "SELECT tableoid, oid, "

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, "

"a.attstattarget, a.attstorage, t.typstorage, "

"a.attnotnull, a.atthasdef, a.attisdropped, "

int i,

ntups;

- if (g_fout->remoteVersion < 80500)

+ if (g_fout->remoteVersion < 90000)

{

*numDefaultACLs = 0;

return NULL;

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c

index f1d74574313c94c8a8e2cedbc9a27accf21df8b4..53a1e25d7adf0b270e3bd1807045b70bf94e1e58 100644 (file)

--- a/src/bin/pg_dump/pg_dumpall.c

+++ b/src/bin/pg_dump/pg_dumpall.c

* 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 $

*

*-------------------------------------------------------------------------

*/

/* Dump role/database settings */

if (!tablespaces_only && !roles_only)

{

- if (server_version >= 80500)

+ if (server_version >= 90000)

dumpDbRoleConfig(conn);

}

}

* Get all tablespaces except built-in ones (which we assume are named

* pg_xxx)

*/

- if (server_version >= 80500)

+ if (server_version >= 90000)

res = executeQuery(conn, "SELECT spcname, "

"pg_catalog.pg_get_userbyid(spcowner) AS spcowner, "

"spclocation, spcacl, "

{

PGresult *res;

- if (server_version >= 80500)

+ if (server_version >= 90000)

printfPQExpBuffer(buf, "SELECT setconfig[%d] FROM pg_db_role_setting WHERE "

"setrole = 0 AND setdatabase = (SELECT oid FROM pg_database WHERE datname = ", count);

else

printfPQExpBuffer(buf, "SELECT datconfig[%d] FROM pg_database WHERE datname = ", count);

appendStringLiteralConn(buf, dbname, conn);

- if (server_version >= 80500)

+ if (server_version >= 90000)

appendPQExpBuffer(buf, ")");

appendPQExpBuffer(buf, ";");

{

PGresult *res;

- if (server_version >= 80500)

+ if (server_version >= 90000)

printfPQExpBuffer(buf, "SELECT setconfig[%d] FROM pg_db_role_setting WHERE "

"setdatabase = 0 AND setrole = "

"(SELECT oid FROM pg_authid WHERE rolname = ", count);

else

printfPQExpBuffer(buf, "SELECT useconfig[%d] FROM pg_shadow WHERE usename = ", count);

appendStringLiteralConn(buf, username, conn);

- if (server_version >= 80500)

+ if (server_version >= 90000)

appendPQExpBuffer(buf, ")");

res = executeQuery(conn, buf->data);

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c

index d42cf2394faea1e829c2f26b823b2d0283b37b5c..6a6517d0032ffe3d9369445525c6bff0f5c9e4ac 100644 (file)

--- a/src/bin/psql/describe.c

+++ b/src/bin/psql/describe.c

*

* 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"

printQueryOpt myopt = pset.popt;

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"),

pset.sversion / 10000, (pset.sversion / 100) % 100);

initPQExpBuffer(&tmpbuf);

/* Get general table info */

- if (pset.sversion >= 80500)

+ if (pset.sversion >= 90000)

{

printfPQExpBuffer(&buf,

"SELECT c.relchecks, c.relkind, c.relhasindex, c.relhasrules, "

strdup(PQgetvalue(res, 0, 6)) : 0;

tableinfo.tablespace = (pset.sversion >= 80000) ?

atooid(PQgetvalue(res, 0, 7)) : 0;

- tableinfo.hasexclusion = (pset.sversion >= 80500) ?

+ tableinfo.hasexclusion = (pset.sversion >= 90000) ?

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;

PQclear(res);

res = NULL;

appendPQExpBuffer(&buf, "i.indisvalid,\n");

else

appendPQExpBuffer(&buf, "true AS indisvalid,\n");

- if (pset.sversion >= 80500)

+ if (pset.sversion >= 90000)

appendPQExpBuffer(&buf,

" (NOT i.indimmediate) AND "

"EXISTS (SELECT 1 FROM pg_catalog.pg_depend d, "

else

appendPQExpBuffer(&buf, "true as indisvalid, ");

appendPQExpBuffer(&buf, "pg_catalog.pg_get_indexdef(i.indexrelid, 0, true)");

- if (pset.sversion >= 80500)

+ if (pset.sversion >= 90000)

appendPQExpBuffer(&buf,

",\n (NOT i.indimmediate) AND "

"EXISTS (SELECT 1 FROM pg_catalog.pg_depend d, "

"t.tgenabled\n"

"FROM pg_catalog.pg_trigger t\n"

"WHERE t.tgrelid = '%s' AND ",

- (pset.sversion >= 80500 ? ", true" : ""),

+ (pset.sversion >= 90000 ? ", true" : ""),

oid);

- if (pset.sversion >= 80500)

+ if (pset.sversion >= 90000)

appendPQExpBuffer(&buf, "NOT t.tgisinternal");

else if (pset.sversion >= 80300)

appendPQExpBuffer(&buf, "t.tgconstraint = 0");

initPQExpBuffer(&buf);

- if (pset.sversion >= 80500)

+ if (pset.sversion >= 90000)

{

bool havewhere;

diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c

index 2c965828964fcee509cc1131afdfa766f5ac8388..a83039d353c16f5f678bb6ea695d75bfd3228b1f 100644 (file)

--- a/src/bin/psql/large_obj.c

+++ b/src/bin/psql/large_obj.c

*

* 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 "large_obj.h"

char buf[1024];

printQueryOpt myopt = pset.popt;

- if (pset.sversion >= 80500)

+ if (pset.sversion >= 90000)

{

snprintf(buf, sizeof(buf),

"SELECT oid as \"%s\",\n"

diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c

index 242ea9ebae11a81db0727d16110b9b052fd28fc2..af1dc8c397d638a98b2298fc3cc8175b91d53641 100644 (file)

--- a/src/bin/scripts/vacuumdb.c

+++ b/src/bin/scripts/vacuumdb.c

* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group

* 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 $

*

*-------------------------------------------------------------------------

*/

else

{

appendPQExpBuffer(&sql, "VACUUM");

- if (PQserverVersion(conn) >= 80500)

+ if (PQserverVersion(conn) >= 90000)

{

const char *paren = " (";

const char *comma = ", ";

diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h

index f064ef4acabf4c536f7371167090ada7274ce608..8d9d3f371763fdd94f66151811d8d5c7536cec7e 100644 (file)

--- a/src/include/catalog/pg_control.h

+++ b/src/include/catalog/pg_control.h

* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group

* 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 $

*

*-------------------------------------------------------------------------

*/

/* 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

diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h

index c1e711dff87ca0cb89fc967b5d4986183632b0d3..9cc8edd3c653c799d6f9e57a385398b13c094b1b 100644 (file)

--- a/src/include/nodes/primnodes.h

+++ b/src/include/nodes/primnodes.h

* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group

* 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 $

*

*-------------------------------------------------------------------------

*/

* Aggref

*

* 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

* 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

diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32

index de97bcfab12c15c44ff7cd4c5f1e72f76445691d..b9ebeb55cae525264ff1a89d6e24cf723c21be88 100644 (file)

--- a/src/include/pg_config.h.win32

+++ b/src/include/pg_config.h.win32

#define PACKAGE_NAME "PostgreSQL"

/* 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 PACKAGE_VERSION "8.5devel"

+#define PACKAGE_VERSION "9.0devel"

/* PostgreSQL version as a string */

-#define PG_VERSION "8.5devel"

+#define PG_VERSION "9.0devel"

/* 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 PACKAGE_TARNAME "postgresql"

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c

index 994b70b190487888b88af7b8775faf1d962ddc08..89e61a7ec710dcdb1095d26a23e7754c29b70fdd 100644 (file)

--- a/src/interfaces/libpq/fe-connect.c

+++ b/src/interfaces/libpq/fe-connect.c

*

*

* 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 $

*

*-------------------------------------------------------------------------

*/

#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

* than looking into errcodes.h since it reflects historical behavior

* rather than that of the current code.

{

/*

* 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,

* close the connection and retry without sending

* application_name. We could possibly get a false

diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c

index df4e8879c848e04c0bd3bc018c698d1661e10376..bded5aedd9d6c4de870dbec476f86f5628d8e2aa 100644 (file)

--- a/src/interfaces/libpq/fe-exec.c

+++ b/src/interfaces/libpq/fe-exec.c

*

*

* 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 $

*

*-------------------------------------------------------------------------

*/

return NULL;

return PQescapeByteaInternal(conn, from, from_length, to_length,

conn->std_strings,

- (conn->sversion >= 80500));

+ (conn->sversion >= 90000));

}

unsigned char *

diff --git a/src/interfaces/libpq/libpq.rc.in b/src/interfaces/libpq/libpq.rc.in

index 318fd628496d62701d4a5e677570522183ec0996..2e387c9f9b93ffa6b5bcf10137f2c4ac1af66df2 100644 (file)

--- a/src/interfaces/libpq/libpq.rc.in

+++ b/src/interfaces/libpq/libpq.rc.in

#include <winver.h>

VS_VERSION_INFO VERSIONINFO

- FILEVERSION 8,5,0,0

- PRODUCTVERSION 8,5,0,0

+ FILEVERSION 9,0,0,0

+ PRODUCTVERSION 9,0,0,0

FILEFLAGSMASK 0x3fL

FILEFLAGS 0

FILEOS VOS__WINDOWS32

BEGIN

VALUE "CompanyName", "0円"

VALUE "FileDescription", "PostgreSQL Access Library0円"

- VALUE "FileVersion", "8.5.00円"

+ VALUE "FileVersion", "9.0.00円"

VALUE "InternalName", "libpq0円"

VALUE "LegalCopyright", "Copyright (C) 20100円"

VALUE "LegalTrademarks", "0円"

VALUE "OriginalFilename", "libpq.dll0円"

VALUE "ProductName", "PostgreSQL0円"

- VALUE "ProductVersion", "8.5.00円"

+ VALUE "ProductVersion", "9.0.00円"

END

END

BLOCK "VarFileInfo"

diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc

index 188b5b0c405526cd4536cffcf95e79ef19933a87..6757dc1ac2a55cbf9795ffcf721f27270fc3095b 100644 (file)

--- a/src/port/win32ver.rc

+++ b/src/port/win32ver.rc

#include "pg_config.h"

VS_VERSION_INFO VERSIONINFO

- FILEVERSION 8,5,0,0

- PRODUCTVERSION 8,5,0,0

+ FILEVERSION 9,0,0,0

+ PRODUCTVERSION 9,0,0,0

FILEFLAGSMASK 0x17L

FILEFLAGS 0x0L

FILEOS VOS_NT_WINDOWS32

diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out

index 5f921dda8a2ea7f9d384b9fae82bfb440deded2e..15cbe02977008dcf3d7f1f482bdd65b30793f551 100644 (file)

--- a/src/test/regress/expected/copy2.out

+++ b/src/test/regress/expected/copy2.out

"Jackson, Sam","\h"

"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);

"Jackson, Sam",\h

"It is ""perfect"".",

diff --git a/src/test/regress/sql/copy2.sql b/src/test/regress/sql/copy2.sql

index ba0b0a62ad700062488a34226e4b9fed9d102505..c2e8b037e74be329c0829e4c6c25c4a4106e23c7 100644 (file)

--- a/src/test/regress/sql/copy2.sql

+++ b/src/test/regress/sql/copy2.sql

COPY y TO stdout WITH CSV FORCE QUOTE col2 ESCAPE E'\\';

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, QUOTE '''', DELIMITER '|');

diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl

index 44d2d99e8fd2d22c4130a588bdab08816bdf9494..aff2c289fda4d3cd88e843fd1dffc9ffade66299 100755 (executable)

--- a/src/tools/version_stamp.pl

+++ b/src/tools/version_stamp.pl

#

# 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 $

#################################################################

#

# Major version is hard-wired into the script. We update it when we branch

# a new development version.

-$major1 = 8;

-$major2 = 5;

+$major1 = 9;

+$major2 = 0;

# Validate argument and compute derived variables

$minor = shift;