From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 2 Jul 2014 17:11:04 +0000 (-0400)
Subject: pg_upgrade:  no need to remove "members" files for pre-9.3 upgrades
X-Git-Tag: REL9_3_5~19
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=174421bd1c2c5c10fbf015fd570354d8e27fe259;p=postgresql.git

pg_upgrade:  no need to remove "members" files for pre-9.3 upgrades

Per analysis by Alvaro

Backpatch through 9.3
---

diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
index 91618f8b538..7e73f7e1ae4 100644
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -452,11 +452,11 @@ copy_clog_xlog_xid(void)
 	else if (new_cluster.controldata.cat_ver >= MULTIXACT_FORMATCHANGE_CAT_VER)
 	{
 		/*
-		 * Remove files created by initdb that no longer match the
-		 * new multi-xid value.
+		 * Remove offsets/0000 file created by initdb that no longer matches
+		 * the new multi-xid value.  "members" starts at zero so no need to
+		 * remove it.
 		 */
 		remove_new_subdir("pg_multixact/offsets", false);
-		remove_new_subdir("pg_multixact/members", false);
 
 		prep_status("Setting oldest multixact ID on new cluster");