From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 13 Apr 2011 15:33:55 +0000 (-0400)
Subject: Fix pg_upgrade crash
X-Git-Tag: REL9_0_4~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=052e621cc2c25166037fe9fadd3082ae70045fec;p=thirdparty%2Fpostgresql.git

Fix pg_upgrade crash

Fix pg_upgrade crash in 9.0 caused by a new cluster database that
doesn't exist in the old cluster;  instead throw an error.  This was
reported to me by EnterpriseDB testing staff.  This bug does not exist
in git head.
---

diff --git a/contrib/pg_upgrade/relfilenode.c b/contrib/pg_upgrade/relfilenode.c
index b20ca200f18..fc36968f99d 100644
--- a/contrib/pg_upgrade/relfilenode.c
+++ b/contrib/pg_upgrade/relfilenode.c
@@ -46,6 +46,10 @@ transfer_all_new_dbs(migratorContext *ctx, DbInfoArr *olddb_arr,
 		int			n_maps;
 		pageCnvCtx *pageConverter = NULL;
 
+		if (!old_db)
+			pg_log(ctx, PG_FATAL,
+			   "the new cluster database %s was not found in the old cluster\n", new_db->db_name);
+		
 		n_maps = 0;
 		mappings = gen_db_file_maps(ctx, old_db, new_db, &n_maps, old_pgdata,
 									new_pgdata);