From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 2 Jul 2014 17:11:05 +0000 (-0400)
Subject: pg_upgrade:  no need to remove "members" files for pre-9.3 upgrades
X-Git-Tag: REL9_5_ALPHA1~1775
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89cf2d5203085a3b74ab8ce1f323c93f8e410473;p=postgresql

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 b32d81efe7..f19d9116d2 100644
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -451,11 +451,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");