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

1 files changed, 18 insertions, 15 deletions

diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index 2e38990323..1a7ec68d7c 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -1766,7 +1766,25 @@ writezone(const char *name, const char *string)
 			if (pass == 1)
 				puttzcode((long) ats[i], fp);
 			else
+			{
 				puttzcode64(ats[i], fp);
+
+				/* Print current timezone abbreviations if requested */
+				if (print_abbrevs &&
+					(i == thistimelim - 1 || ats[i + 1] > print_cutoff))
+				{
+					unsigned char tm = typemap[types[i]];
+					char	   *thisabbrev = &thischars[indmap[abbrinds[tm]]];
+
+					/* filter out assorted junk entries */
+					if (strcmp(thisabbrev, GRANDPARENTED) != 0 &&
+						strcmp(thisabbrev, "zzz") != 0)
+						fprintf(stdout, "%s\t%ld%s\n",
+								thisabbrev,
+								gmtoffs[tm],
+								isdsts[tm] ? "\tD" : "");
+				}
+			}
 		for (i = thistimei; i < thistimelim; ++i)
 		{
 			unsigned char uc;
@@ -1783,21 +1801,6 @@ writezone(const char *name, const char *string)
 				puttzcode(gmtoffs[i], fp);
 				(void) putc(isdsts[i], fp);
 				(void) putc((unsigned char) indmap[abbrinds[i]], fp);
-
-				/* Print current timezone abbreviations if requested */
-				if (print_abbrevs && pass == 2 &&
-					(ats[i] >= print_cutoff || i == typecnt - 1))
-				{
-					char	   *thisabbrev = &thischars[indmap[abbrinds[i]]];
-
-					/* filter out assorted junk entries */
-					if (strcmp(thisabbrev, GRANDPARENTED) != 0 &&
-						strcmp(thisabbrev, "zzz") != 0)
-						fprintf(stdout, "%s\t%ld%s\n",
-								thisabbrev,
-								gmtoffs[i],
-								isdsts[i] ? "\tD" : "");
-				}
 			}
 		if (thischarcnt != 0)
 			(void) fwrite((void *) thischars,