Merge commit '5a2a527b'

Noth much interesting here, but I wanted to stop before the next upstream
commit, which is a mechanical Copyright year bump.

Conflicts:
	contrib/btree_gist/btree_gist.sql.in
	doc/FAQ
	doc/FAQ_DEV
	doc/FAQ_japanese
	doc/bug.template
	doc/src/FAQ/FAQ.html
	doc/src/FAQ/FAQ_DEV.html
	doc/src/FAQ/FAQ_japanese.html
	doc/src/sgml/ref/pg_ctl-ref.sgml
	doc/src/sgml/ref/postgres-ref.sgml
	doc/src/sgml/ref/reindex.sgml
	doc/src/sgml/release.sgml
	src/backend/access/gin/ginvacuum.c
	src/backend/access/heap/tuptoaster.c
	src/backend/main/main.c
	src/backend/postmaster/postmaster.c
	src/backend/tcop/postgres.c
	src/backend/utils/adt/float.c
	src/backend/utils/adt/regexp.c
	src/bin/pg_ctl/pg_ctl.c
	src/bin/pg_dump/dumputils.c
	src/include/catalog/pg_type.h
	src/include/pg_config.h.win32
	src/include/utils/builtins.h
	src/interfaces/ecpg/compatlib/Makefile
	src/interfaces/ecpg/ecpglib/Makefile
	src/interfaces/ecpg/pgtypeslib/Makefile
	src/interfaces/ecpg/preproc/Makefile
	src/interfaces/libpq/Makefile
	src/interfaces/libpq/libpq.rc.in
	src/port/win32ver.rc
	src/test/regress/pg_regress.c
	src/tools/RELEASE_CHANGES
	src/tools/copyright
	src/tools/msvc/Project.pm

doc/src/sgml/ref/pg_ctl-ref.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.35.2.2 2007/03/26 17:23:44 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.36 2007/01/05 16:17:54 adunstan Exp $
 PostgreSQL documentation
 -->
 
@@ -29,6 +29,7 @@ PostgreSQL documentation
    <arg>-l <replaceable>filename</replaceable></arg>
    <arg>-o <replaceable>options</replaceable></arg>
    <arg>-p <replaceable>path</replaceable></arg>
+   <arg>-c</arg>
    <sbr>
    <command>pg_ctl</command>
    <arg choice="plain">stop</arg>
@@ -48,6 +49,7 @@ PostgreSQL documentation
    <arg>-w</arg>
    <arg>-s</arg>
    <arg>-D <replaceable>datadir</replaceable></arg>
+   <arg>-c</arg>
    <arg>-m
      <group choice="plain">
        <arg>s[mart]</arg>
@@ -245,6 +247,19 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>-c</option></term>
+      <listitem>
+       <para>
+        Attempt to allow server crashes to produce core files, on platforms
+        where this available, by lifting any soft resource limit placed on 
+		them. 
+		This is useful in debugging or diagnosing problems by allowing a 
+		stack trace to be obtained from a failed server process.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>-w</option></term>
       <listitem>

doc/src/sgml/ref/postgres-ref.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.47.2.1 2007/01/04 00:58:01 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.48 2007/01/04 00:57:51 tgl Exp $
 PostgreSQL documentation
 -->
 

doc/src/sgml/ref/reindex.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.34.2.1 2007/01/05 01:19:04 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.35 2007/01/05 01:18:59 tgl Exp $
 PostgreSQL documentation
 -->
 

src/backend/access/gin/ginvacuum.c

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/ginvacuum.c,v 1.9.2.2 2007/06/05 12:48:21 teodor Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/ginvacuum.c,v 1.10 2007/01/04 16:29:41 tgl Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -36,8 +36,8 @@ typedef struct
 /*
  * Cleans array of ItemPointer (removes dead pointers)
  * Results are always stored in *cleaned, which will be allocated
- * if its needed. In case of *cleaned!=NULL caller is responsible to
- * enough space. *cleaned and items may point to the same
+ * if it's needed. In case of *cleaned!=NULL caller is responsible to
+ * have allocated enough space. *cleaned and items may point to the same
  * memory address.
  */
 

src/backend/access/heap/tuptoaster.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/heap/tuptoaster.c,v 1.66.2.1 2007/02/04 20:00:49 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/heap/tuptoaster.c,v 1.67 2007/01/04 16:29:41 tgl Exp $
  *
  *
  * INTERFACE ROUTINES

src/backend/postmaster/postmaster.c

@@ -38,8 +38,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.505.2.3 2007/02/11 15:12:21 mha Exp $
- *
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.506 2007/01/04 00:57:51 tgl Exp $
  *
  * NOTES
  *

src/backend/tcop/postgres.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.519 2006/12/08 02:15:07 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.520 2007/01/04 00:57:51 tgl Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and

src/backend/utils/adt/float.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.137 2007/01/03 14:35:24 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.141 2007/01/05 03:19:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */

src/backend/utils/adt/selfuncs.c

@@ -16,7 +16,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.216 2006/12/23 00:43:11 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.217 2007/01/03 22:39:26 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */

src/bin/pg_dump/dumputils.c

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.33.2.1 2007/01/04 17:49:42 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.34 2007/01/04 17:49:37 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -468,6 +468,20 @@ buildACLCommands(const char *name, const char *type,
 	appendPQExpBuffer(firstsql, "REVOKE ALL ON %s %s FROM PUBLIC;\n",
 					  type, name);
 
+	/*
+	 * We still need some hacking though to cover the case where new default
+	 * public privileges are added in new versions: the REVOKE ALL will revoke
+	 * them, leading to behavior different from what the old version had,
+	 * which is generally not what's wanted.  So add back default privs if
+	 * the source database is too old to have had that particular priv.
+	 */
+	if (remoteVersion < 80200 && strcmp(type, "DATABASE") == 0)
+	{
+		/* database CONNECT priv didn't exist before 8.2 */
+		appendPQExpBuffer(firstsql, "GRANT CONNECT ON %s %s TO PUBLIC;\n",
+						  type, name);
+	}
+
 	/* Scan individual ACL items */
 	for (i = 0; i < naclitems; i++)
 	{

src/include/catalog/pg_type.h

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.177 2007/01/03 01:19:51 darcy Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.178 2007/01/04 16:29:42 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki

src/include/pg_config.h.win32

@@ -606,16 +606,16 @@
 #define PACKAGE_NAME "Greenplum Database"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Greenplum Database 8.2.13"
+#define PACKAGE_STRING "Greenplum Database 8.3devel"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "8.2.13"
+#define PACKAGE_VERSION "8.3"
 
 /* PostgreSQL version as a string */
-#define PG_VERSION "8.2.13"
+#define PG_VERSION "8.3"
 
 /* PostgreSQL version as a number */
-#define PG_VERSION_NUM 80213
+#define PG_VERSION_NUM 80300
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "greenplum"

src/include/utils/builtins.h

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.283 2006/12/30 21:21:55 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.284 2007/01/03 22:39:26 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */

src/interfaces/ecpg/compatlib/Makefile

@@ -28,7 +28,7 @@ override CFLAGS += $(PTHREAD_CFLAGS)
 
 SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq) \
 	$(filter -lintl -lm, $(LIBS)) $(PTHREAD_LIBS)
-	
+
 # For a bug in gcc on centos 32-bit
 ifeq ($(GCC), yes)
  CFLAGS += -Wno-error

src/port/win32ver.rc

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