Merge remote-tracking branch 'remotes/PGSQL/master' into XL_NEW_MASTER

Conflicts:
	COPYRIGHT
	configure
	configure.in
	contrib/Makefile
	doc/bug.template
	src/backend/access/common/heaptuple.c
	src/backend/access/common/printtup.c
	src/backend/access/transam/Makefile
	src/backend/access/transam/clog.c
	src/backend/access/transam/twophase.c
	src/backend/access/transam/varsup.c
	src/backend/access/transam/xact.c
	src/backend/access/transam/xlog.c
	src/backend/bootstrap/bootstrap.c
	src/backend/catalog/Makefile
	src/backend/catalog/catalog.c
	src/backend/catalog/dependency.c
	src/backend/catalog/genbki.pl
	src/backend/catalog/namespace.c
	src/backend/catalog/pg_aggregate.c
	src/backend/catalog/pg_proc.c
	src/backend/catalog/storage.c
	src/backend/commands/aggregatecmds.c
	src/backend/commands/analyze.c
	src/backend/commands/comment.c
	src/backend/commands/copy.c
	src/backend/commands/dbcommands.c
	src/backend/commands/event_trigger.c
	src/backend/commands/explain.c
	src/backend/commands/indexcmds.c
	src/backend/commands/portalcmds.c
	src/backend/commands/schemacmds.c
	src/backend/commands/sequence.c
	src/backend/commands/tablecmds.c
	src/backend/commands/trigger.c
	src/backend/commands/vacuum.c
	src/backend/commands/variable.c
	src/backend/commands/view.c
	src/backend/executor/execAmi.c
	src/backend/executor/execCurrent.c
	src/backend/executor/execMain.c
	src/backend/executor/execProcnode.c
	src/backend/executor/execTuples.c
	src/backend/executor/execUtils.c
	src/backend/executor/nodeAgg.c
	src/backend/executor/nodeModifyTable.c
	src/backend/executor/nodeSubplan.c
	src/backend/executor/nodeWindowAgg.c
	src/backend/libpq/hba.c
	src/backend/nodes/copyfuncs.c
	src/backend/nodes/equalfuncs.c
	src/backend/nodes/outfuncs.c
	src/backend/nodes/readfuncs.c
	src/backend/optimizer/path/allpaths.c
	src/backend/optimizer/path/costsize.c
	src/backend/optimizer/plan/createplan.c
	src/backend/optimizer/plan/planagg.c
	src/backend/optimizer/plan/planner.c
	src/backend/optimizer/plan/setrefs.c
	src/backend/optimizer/plan/subselect.c
	src/backend/optimizer/prep/preptlist.c
	src/backend/optimizer/prep/prepunion.c
	src/backend/optimizer/util/pathnode.c
	src/backend/optimizer/util/plancat.c
	src/backend/parser/analyze.c
	src/backend/parser/gram.y
	src/backend/parser/parse_agg.c
	src/backend/parser/parse_relation.c
	src/backend/parser/parse_utilcmd.c
	src/backend/postmaster/autovacuum.c
	src/backend/postmaster/pgstat.c
	src/backend/postmaster/postmaster.c
	src/backend/replication/logical/decode.c
	src/backend/storage/buffer/bufmgr.c
	src/backend/storage/ipc/ipci.c
	src/backend/storage/ipc/procarray.c
	src/backend/storage/ipc/procsignal.c
	src/backend/storage/lmgr/lock.c
	src/backend/storage/lmgr/lwlock.c
	src/backend/storage/lmgr/proc.c
	src/backend/tcop/dest.c
	src/backend/tcop/postgres.c
	src/backend/tcop/pquery.c
	src/backend/tcop/utility.c
	src/backend/utils/adt/arrayfuncs.c
	src/backend/utils/adt/date.c
	src/backend/utils/adt/dbsize.c
	src/backend/utils/adt/pseudotypes.c
	src/backend/utils/adt/ri_triggers.c
	src/backend/utils/adt/ruleutils.c
	src/backend/utils/adt/version.c
	src/backend/utils/cache/inval.c
	src/backend/utils/cache/lsyscache.c
	src/backend/utils/cache/plancache.c
	src/backend/utils/cache/relcache.c
	src/backend/utils/init/globals.c
	src/backend/utils/init/miscinit.c
	src/backend/utils/init/postinit.c
	src/backend/utils/misc/guc.c
	src/backend/utils/mmgr/portalmem.c
	src/backend/utils/sort/tuplesort.c
	src/backend/utils/sort/tuplestore.c
	src/backend/utils/time/combocid.c
	src/backend/utils/time/snapmgr.c
	src/bin/Makefile
	src/bin/initdb/initdb.c
	src/bin/pg_ctl/pg_ctl.c
	src/bin/pg_dump/pg_dump.c
	src/bin/pgbench/pgbench.c
	src/bin/psql/tab-complete.c
	src/include/access/htup.h
	src/include/access/rmgrlist.h
	src/include/access/transam.h
	src/include/access/xact.h
	src/include/catalog/catalog.h
	src/include/catalog/namespace.h
	src/include/catalog/pg_aggregate.h
	src/include/catalog/pg_namespace.h
	src/include/catalog/pg_proc.h
	src/include/catalog/pg_type.h
	src/include/commands/explain.h
	src/include/commands/sequence.h
	src/include/commands/vacuum.h
	src/include/commands/variable.h
	src/include/executor/execdesc.h
	src/include/executor/executor.h
	src/include/executor/tuptable.h
	src/include/miscadmin.h
	src/include/nodes/execnodes.h
	src/include/nodes/nodes.h
	src/include/nodes/params.h
	src/include/nodes/parsenodes.h
	src/include/nodes/plannodes.h
	src/include/nodes/primnodes.h
	src/include/nodes/relation.h
	src/include/optimizer/cost.h
	src/include/optimizer/pathnode.h
	src/include/optimizer/planmain.h
	src/include/parser/analyze.h
	src/include/parser/parse_agg.h
	src/include/parser/parse_utilcmd.h
	src/include/pg_config.h.win32
	src/include/pgstat.h
	src/include/storage/backendid.h
	src/include/storage/barrier.h
	src/include/storage/lwlock.h
	src/include/storage/proc.h
	src/include/storage/procarray.h
	src/include/storage/procsignal.h
	src/include/storage/smgr.h
	src/include/tcop/dest.h
	src/include/tcop/pquery.h
	src/include/utils/builtins.h
	src/include/utils/guc.h
	src/include/utils/lsyscache.h
	src/include/utils/plancache.h
	src/include/utils/portal.h
	src/include/utils/rel.h
	src/include/utils/tuplesort.h
	src/include/utils/tuplestore.h
	src/test/regress/expected/aggregates.out
	src/test/regress/expected/create_index.out
	src/test/regress/expected/foreign_data.out
	src/test/regress/expected/join.out
	src/test/regress/expected/macaddr.out
	src/test/regress/expected/polygon.out
	src/test/regress/expected/rangetypes.out
	src/test/regress/expected/update.out
	src/test/regress/input/constraints.source
	src/test/regress/pg_regress.c
	src/test/regress/serial_schedule
	src/test/regress/sql/rangetypes.sql

6 files changed, 20 insertions, 29 deletions

diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index b5cd5d0f33..67f7867761 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -1,10 +1,11 @@
 # contrib/cube/Makefile
 
 MODULE_big = cube
-OBJS= cube.o cubeparse.o
+OBJS= cube.o cubeparse.o $(WIN32RES)
 
 EXTENSION = cube
 DATA = cube--1.0.sql cube--unpackaged--1.0.sql
+PGFILEDESC = "cube - multidimensional cube data type"
 
 REGRESS = cube
 
diff --git a/contrib/cube/cube--unpackaged--1.0.sql b/contrib/cube/cube--unpackaged--1.0.sql
index 6859682786..1065512a29 100644
--- a/contrib/cube/cube--unpackaged--1.0.sql
+++ b/contrib/cube/cube--unpackaged--1.0.sql
@@ -1,7 +1,7 @@
 /* contrib/cube/cube--unpackaged--1.0.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION cube" to load this file. \quit
+\echo Use "CREATE EXTENSION cube FROM unpackaged" to load this file. \quit
 
 ALTER EXTENSION cube ADD type cube;
 ALTER EXTENSION cube ADD function cube_in(cstring);
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
index b0305ef431..b9ccad994a 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -26,11 +26,6 @@ PG_MODULE_MAGIC;
 #define ARRPTR(x)  ( (double *) ARR_DATA_PTR(x) )
 #define ARRNELEMS(x)  ArrayGetNItems( ARR_NDIM(x), ARR_DIMS(x))
 
-extern int	cube_yyparse(NDBOX **result);
-extern void cube_yyerror(NDBOX **result, const char *message);
-extern void cube_scanner_init(const char *str);
-extern void cube_scanner_finish(void);
-
 /*
 ** Input/Output routines
 */
diff --git a/contrib/cube/cubedata.h b/contrib/cube/cubedata.h
index 5d44e11081..59c23ded6a 100644
--- a/contrib/cube/cubedata.h
+++ b/contrib/cube/cubedata.h
@@ -23,11 +23,10 @@ typedef struct NDBOX
 	unsigned int header;
 
 	/*
-	 * Variable length array. The lower left coordinates for each dimension
-	 * come first, followed by upper right coordinates unless the point flag
-	 * is set.
+	 * The lower left coordinates for each dimension come first, followed by
+	 * upper right coordinates unless the point flag is set.
 	 */
-	double		x[1];
+	double		x[FLEXIBLE_ARRAY_MEMBER];
 } NDBOX;
 
 #define POINT_BIT			0x80000000
@@ -41,9 +40,18 @@ typedef struct NDBOX
 #define LL_COORD(cube, i) ( (cube)->x[i] )
 #define UR_COORD(cube, i) ( IS_POINT(cube) ? (cube)->x[i] : (cube)->x[(i) + DIM(cube)] )
 
-#define POINT_SIZE(_dim) (offsetof(NDBOX, x[0]) + sizeof(double)*(_dim))
-#define CUBE_SIZE(_dim) (offsetof(NDBOX, x[0]) + sizeof(double)*(_dim)*2)
+#define POINT_SIZE(_dim)	(offsetof(NDBOX, x) + sizeof(double)*(_dim))
+#define CUBE_SIZE(_dim)		(offsetof(NDBOX, x) + sizeof(double)*(_dim)*2)
 
-#define DatumGetNDBOX(x)	((NDBOX*)DatumGetPointer(x))
-#define PG_GETARG_NDBOX(x)	DatumGetNDBOX( PG_DETOAST_DATUM(PG_GETARG_DATUM(x)) )
+#define DatumGetNDBOX(x)	((NDBOX *) PG_DETOAST_DATUM(x))
+#define PG_GETARG_NDBOX(x)	DatumGetNDBOX(PG_GETARG_DATUM(x))
 #define PG_RETURN_NDBOX(x)	PG_RETURN_POINTER(x)
+
+/* in cubescan.l */
+extern int	cube_yylex(void);
+extern void cube_yyerror(NDBOX **result, const char *message) pg_attribute_noreturn();
+extern void cube_scanner_init(const char *str);
+extern void cube_scanner_finish(void);
+
+/* in cubeparse.y */
+extern int	cube_yyparse(NDBOX **result);
diff --git a/contrib/cube/cubeparse.y b/contrib/cube/cubeparse.y
index 0baee8e132..33606c741c 100644
--- a/contrib/cube/cubeparse.y
+++ b/contrib/cube/cubeparse.y
@@ -22,14 +22,9 @@
 #define YYMALLOC palloc
 #define YYFREE   pfree
 
-extern int cube_yylex(void);
-
 static char *scanbuf;
 static int	scanbuflen;
 
-extern int	cube_yyparse(NDBOX **result);
-extern void cube_yyerror(NDBOX **result, const char *message);
-
 static int delim_count(char *s, char delim);
 static NDBOX * write_box(unsigned int dim, char *str1, char *str2);
 static NDBOX * write_point_as_box(char *s, int dim);
diff --git a/contrib/cube/cubescan.l b/contrib/cube/cubescan.l
index e383b59d3d..4408e28387 100644
--- a/contrib/cube/cubescan.l
+++ b/contrib/cube/cubescan.l
@@ -4,8 +4,6 @@
  * contrib/cube/cubescan.l
  */
 
-#include "postgres.h"
-
 /* No reason to constrain amount of data slurped */
 #define YY_READ_BUF_SIZE 16777216
 
@@ -24,12 +22,6 @@ static YY_BUFFER_STATE scanbufhandle;
 /* this is now declared in cubeparse.y: */
 /* static char *scanbuf; */
 /* static int	scanbuflen; */
-
-/* flex 2.5.4 doesn't bother with a decl for this */
-int cube_yylex(void);
-
-void cube_scanner_init(const char *str);
-void cube_scanner_finish(void);
 %}
 
 %option 8bit
@@ -60,7 +52,7 @@ float        ({integer}|{real})([eE]{integer})?
 
 %%
 
-void __attribute__((noreturn))
+void
 yyerror(NDBOX **result, const char *message)
 {
 	if (*yytext == YY_END_OF_BUFFER_CHAR)