From 50a90fac40db82680ac7ceacf3348f3f08f5343e Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 17 Feb 2010 04:19:41 +0000
Subject: [PATCH] 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.

---
 configure                                     | 18 +++++++-------
 configure.in                                  |  4 ++--
 contrib/vacuumlo/vacuumlo.c                   |  4 ++--
 doc/bug.template                              |  2 +-
 doc/src/sgml/catalogs.sgml                    |  4 ++--
 doc/src/sgml/config.sgml                      |  8 +++----
 doc/src/sgml/datatype.sgml                    |  4 ++--
 doc/src/sgml/ecpg.sgml                        |  4 ++--
 doc/src/sgml/filelist.sgml                    |  4 ++--
 doc/src/sgml/high-availability.sgml           |  4 ++--
 doc/src/sgml/hstore.sgml                      |  4 ++--
 doc/src/sgml/libpq.sgml                       |  4 ++--
 doc/src/sgml/lobj.sgml                        |  4 ++--
 doc/src/sgml/plpgsql.sgml                     |  8 +++----
 doc/src/sgml/protocol.sgml                    |  4 ++--
 doc/src/sgml/ref/copy.sgml                    |  4 ++--
 doc/src/sgml/ref/explain.sgml                 |  4 ++--
 doc/src/sgml/ref/vacuum.sgml                  |  4 ++--
 .../{release-8.5.sgml => release-9.0.sgml}    |  6 ++---
 doc/src/sgml/release.sgml                     |  4 ++--
 doc/src/sgml/stylesheet-man.xsl               |  2 +-
 src/backend/access/transam/xact.c             |  4 ++--
 src/backend/access/transam/xlog.c             |  4 ++--
 src/backend/catalog/pg_largeobject.c          |  4 ++--
 src/backend/commands/functioncmds.c           |  4 ++--
 src/backend/commands/tablespace.c             |  4 ++--
 src/backend/parser/gram.y                     |  4 ++--
 src/backend/replication/walreceiver.c         |  4 ++--
 src/backend/replication/walsender.c           |  4 ++--
 src/backend/utils/cache/relcache.c            |  4 ++--
 src/backend/utils/error/elog.c                |  4 ++--
 src/backend/utils/misc/guc.c                  |  4 ++--
 src/bin/pg_dump/pg_backup_db.c                |  4 ++--
 src/bin/pg_dump/pg_dump.c                     | 24 +++++++++----------
 src/bin/pg_dump/pg_dumpall.c                  | 14 +++++------
 src/bin/psql/describe.c                       | 20 ++++++++--------
 src/bin/psql/large_obj.c                      |  4 ++--
 src/bin/scripts/vacuumdb.c                    |  4 ++--
 src/include/catalog/pg_control.h              |  4 ++--
 src/include/nodes/primnodes.h                 |  4 ++--
 src/include/pg_config.h.win32                 |  8 +++----
 src/interfaces/libpq/fe-connect.c             |  6 ++---
 src/interfaces/libpq/fe-exec.c                |  4 ++--
 src/interfaces/libpq/libpq.rc.in              |  8 +++----
 src/port/win32ver.rc                          |  4 ++--
 src/test/regress/expected/copy2.out           |  2 +-
 src/test/regress/sql/copy2.sql                |  2 +-
 src/tools/version_stamp.pl                    |  6 ++---
 48 files changed, 133 insertions(+), 133 deletions(-)
 rename doc/src/sgml/{release-8.5.sgml => release-9.0.sgml} (99%)

diff --git a/configure b/configure
index c0ca7bc457..f5a93251fb 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /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>.
 #
@@ -598,8 +598,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # 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"
@@ -1410,7 +1410,7 @@ if test "$ac_init_help" = "long"; then
   # 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]...
 
@@ -1475,7 +1475,7 @@ fi
 
 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
 
@@ -1621,7 +1621,7 @@ fi
 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,
@@ -1637,7 +1637,7 @@ cat >config.log <<_ACEOF
 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 $@
@@ -29375,7 +29375,7 @@ exec 6>&1
 # 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
@@ -29442,7 +29442,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _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 6955edbea0..c442e261b6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 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
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
 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 be527f10de..2ed1cbeb93 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -8,7 +8,7 @@
  *
  *
  * 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';
 	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 1b65f62c06..9cb4f2d53f 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -27,7 +27,7 @@ System Configuration:
 
   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 e5bef18d7d..197b782021 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -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
  -->
@@ -3134,7 +3134,7 @@
   </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 6c1c047c7b..4d7119fed2 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -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">
   <title>Server Configuration</title>
@@ -4977,7 +4977,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
       </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
@@ -4985,8 +4985,8 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
        </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 abe747a696..215a4dbab1 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -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">
   <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
     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 bfd0676cd1..eb94a41d8a 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -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">
  <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>
-    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 2ceee79cb9..732c41fb7b 100644
--- a/doc/src/sgml/filelist.sgml
+++ b/doc/src/sgml/filelist.sgml
@@ -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 info       SYSTEM "info.sgml">
@@ -142,7 +142,7 @@
 <!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 2c0c91e15b..e868e232d6 100644
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -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">
  <title>High Availability, Load Balancing, and Replication</title>
@@ -747,7 +747,7 @@ if (!triggered)
    </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 ed707d2191..958a6b9d16 100644
--- a/doc/src/sgml/hstore.sgml
+++ b/doc/src/sgml/hstore.sgml
@@ -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">
  <title>hstore</title>
@@ -542,7 +542,7 @@ SELECT key, count(*) FROM
   </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 0bdb6401c3..6ab8969fc8 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -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">
  <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
        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 90319c47fe..0e567e7dbc 100644
--- a/doc/src/sgml/lobj.sgml
+++ b/doc/src/sgml/lobj.sgml
@@ -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">
   <title id="largeObjects-title">Large Objects</title>
@@ -61,7 +61,7 @@
    </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 af8e372fe8..b682db80bc 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -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">
   <title><application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language</title>
@@ -59,7 +59,7 @@
    </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.
@@ -3520,7 +3520,7 @@ SELECT * FROM sales_summary_bytime;
 
    <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>
@@ -3583,7 +3583,7 @@ SELECT * FROM sales_summary_bytime;
     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 f0a2aeba03..e30ca0d929 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -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">
  <title>Frontend/Backend Protocol</title>
@@ -1101,7 +1101,7 @@
     <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 57a0a6e5f1..ae6e250e46 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -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
 -->
 
@@ -839,7 +839,7 @@ ZW      ZIMBABWE
 
   <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 2f6aaf427a..c28c517400 100644
--- a/doc/src/sgml/ref/explain.sgml
+++ b/doc/src/sgml/ref/explain.sgml
@@ -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
 -->
 
@@ -94,7 +94,7 @@ ROLLBACK;
   <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 64b6f5e23e..bd2b6726c4 100644
--- a/doc/src/sgml/ref/vacuum.sgml
+++ b/doc/src/sgml/ref/vacuum.sgml
@@ -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
 -->
 
@@ -70,7 +70,7 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">
    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 4e247a3811..a9e0b1f97b 100644
--- a/doc/src/sgml/release-8.5.sgml
+++ b/doc/src/sgml/release-9.0.sgml
@@ -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">
-  <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 70f31f0de4..cc3b3e7a73 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -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:
@@ -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
   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 842a9bd503..888f9d416c 100644
--- a/doc/src/sgml/stylesheet-man.xsl
+++ b/doc/src/sgml/stylesheet-man.xsl
@@ -28,7 +28,7 @@
 <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 46a842bb9a..2c32723be6 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -10,7 +10,7 @@
  *
  *
  * 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.
  */
 static void
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 3c1b077c5a..31f50ecb50 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -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
  * 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 d27b20ede3..500a6c9bae 100644
--- a/src/backend/catalog/pg_largeobject.c
+++ b/src/backend/catalog/pg_largeobject.c
@@ -8,7 +8,7 @@
  *
  *
  * 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
 			 * 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 0a9920097b..3de1a9b0ca 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -10,7 +10,7 @@
  *
  *
  * 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
@@ -288,7 +288,7 @@ examine_parameter_list(List *parameters, Oid languageOid,
 			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 2ff3835ab0..32c0612791 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -19,7 +19,7 @@
  * 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
@@ -40,7 +40,7 @@
  *
  *
  * 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 235a7001ad..94b28bf3d8 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * 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
@@ -1997,7 +1997,7 @@ ClosePortalStmt:
  *				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 a2f15a9a03..0e57611da4 100644
--- a/src/backend/replication/walreceiver.c
+++ b/src/backend/replication/walreceiver.c
@@ -2,7 +2,7 @@
  *
  * 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.
  *
@@ -29,7 +29,7 @@
  *
  *
  * 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 0115b70fa2..eb9a5425a2 100644
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -2,7 +2,7 @@
  *
  * 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,
@@ -30,7 +30,7 @@
  *
  *
  * 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 cc62c4fb7c..f015f5b842 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -8,7 +8,7 @@
  *
  *
  * 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
  *			  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 d4e775b57c..a689e30242 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -42,7 +42,7 @@
  *
  *
  * 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
  * 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 fbdfa8f052..bde3be91cf 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * 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 $
  *
  *--------------------------------------------------------------------
  */
@@ -1247,7 +1247,7 @@ static struct config_bool ConfigureNamesBool[] =
 		{"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 4aa10135bb..53711de119 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -5,7 +5,7 @@
  *	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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -704,7 +704,7 @@ void
 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 538a518ef5..ace4ffe34b 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
  *	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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -604,7 +604,7 @@ main(int argc, char **argv)
 	 * 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");
@@ -1952,7 +1952,7 @@ hasBlobs(Archive *AH)
 	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";
@@ -1990,7 +1990,7 @@ dumpBlobs(Archive *AH, void *arg)
 	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";
@@ -2080,7 +2080,7 @@ dumpBlobComments(Archive *AH, void *arg)
 	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 "
@@ -3472,7 +3472,7 @@ getTables(int *numTables)
 	 * 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
@@ -3992,7 +3992,7 @@ getIndexes(TableInfo tblinfo[], int numTables)
 		 * 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, "
@@ -4622,7 +4622,7 @@ getTriggers(TableInfo tblinfo[], int numTables)
 		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
@@ -4831,7 +4831,7 @@ getProcLangs(int *numProcLangs)
 	/* 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, "
@@ -5154,9 +5154,9 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 
 		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, "
@@ -6048,7 +6048,7 @@ getDefaultACLs(int *numDefaultACLs)
 	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 f1d7457431..53a1e25d7a 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * 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 */
 		if (!tablespaces_only && !roles_only)
 		{
-			if (server_version >= 80500)
+			if (server_version >= 90000)
 				dumpDbRoleConfig(conn);
 		}
 	}
@@ -956,7 +956,7 @@ dumpTablespaces(PGconn *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, "
@@ -1348,14 +1348,14 @@ dumpDatabaseConfig(PGconn *conn, const char *dbname)
 	{
 		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, ";");
@@ -1394,7 +1394,7 @@ dumpUserConfig(PGconn *conn, const char *username)
 	{
 		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);
@@ -1403,7 +1403,7 @@ dumpUserConfig(PGconn *conn, const char *username)
 		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 d42cf2394f..6a6517d003 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -8,7 +8,7 @@
  *
  * 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"
 
@@ -745,7 +745,7 @@ listDefaultACLs(const char *pattern)
 	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);
@@ -1123,7 +1123,7 @@ describeOneTableDetails(const char *schemaname,
 	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, "
@@ -1207,9 +1207,9 @@ describeOneTableDetails(const char *schemaname,
 		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;
@@ -1413,7 +1413,7 @@ describeOneTableDetails(const char *schemaname,
 			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, "
@@ -1549,7 +1549,7 @@ describeOneTableDetails(const char *schemaname,
 			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, "
@@ -1862,9 +1862,9 @@ describeOneTableDetails(const char *schemaname,
 							  "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");
@@ -2319,7 +2319,7 @@ listDbRoleSettings(const char *pattern, const char *pattern2)
 
 	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 2c96582896..a83039d353 100644
--- a/src/bin/psql/large_obj.c
+++ b/src/bin/psql/large_obj.c
@@ -3,7 +3,7 @@
  *
  * 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"
@@ -278,7 +278,7 @@ do_lo_list(void)
 	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 242ea9ebae..af1dc8c397 100644
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -5,7 +5,7 @@
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -227,7 +227,7 @@ vacuum_one_database(const char *dbname, bool full, bool verbose, bool and_analyz
 	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 f064ef4aca..8d9d3f3717 100644
--- a/src/include/catalog/pg_control.h
+++ b/src/include/catalog/pg_control.h
@@ -8,7 +8,7 @@
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,7 @@
 
 
 /* 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 c1e711dff8..9cc8edd3c6 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -10,7 +10,7 @@
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -211,7 +211,7 @@ typedef struct Param
  * 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 de97bcfab1..b9ebeb55ca 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -560,16 +560,16 @@
 #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 994b70b190..89e61a7ec7 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * 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
 
 /*
- * 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.
@@ -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 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 df4e8879c8..bded5aedd9 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -8,7 +8,7 @@
  *
  *
  * 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 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 318fd62849..2e387c9f9b 100644
--- a/src/interfaces/libpq/libpq.rc.in
+++ b/src/interfaces/libpq/libpq.rc.in
@@ -1,8 +1,8 @@
 #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
@@ -15,13 +15,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "PostgreSQL Access Library\0"
-            VALUE "FileVersion", "8.5.0\0"
+            VALUE "FileVersion", "9.0.0\0"
             VALUE "InternalName", "libpq\0"
             VALUE "LegalCopyright", "Copyright (C) 2010\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "8.5.0\0"
+            VALUE "ProductVersion", "9.0.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index 188b5b0c40..6757dc1ac2 100644
--- a/src/port/win32ver.rc
+++ b/src/port/win32ver.rc
@@ -2,8 +2,8 @@
 #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 5f921dda8a..15cbe02977 100644
--- a/src/test/regress/expected/copy2.out
+++ b/src/test/regress/expected/copy2.out
@@ -195,7 +195,7 @@ COPY y TO stdout WITH CSV FORCE QUOTE *;
 "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 ba0b0a62ad..c2e8b037e7 100644
--- a/src/test/regress/sql/copy2.sql
+++ b/src/test/regress/sql/copy2.sql
@@ -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 *;
 
--- 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 44d2d99e8f..aff2c289fd 100755
--- a/src/tools/version_stamp.pl
+++ b/src/tools/version_stamp.pl
@@ -5,7 +5,7 @@
 #
 # 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
 # a new development version.
-$major1 = 8;
-$major2 = 5;
+$major1 = 9;
+$major2 = 0;
 
 # Validate argument and compute derived variables
 $minor = shift;