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 ea1f9f663e40db1db25d91d6a79db7b5215ea7df..47ae3cab34e861f58c112d9c9781107f0db1fc90 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");