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 b32d81efe711535699d66f7a621e5a07de313b50..f19d9116d2bdd3ee3e7bf89b13422e0d9913ca9d 100644 (file)
--- 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");