pg_upgrade: preserve freeze info for postgres/template1 dbs

pg_database.datfrozenxid and pg_database.datminmxid were not preserved
for the 'postgres' and 'template1' databases.  This could cause missing
clog file errors on access to user tables and indexes after upgrades in
these databases.

Backpatch through 9.0

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 5802b929a6cb42440c6f1f2a485f9101ad210587..aece0bdb6d887c54bdf5a826010d78e9b01851c9 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -1302,17 +1302,17 @@ dumpCreateDB(PGconn *conn)
                                appendStringLiteralConn(buf, dbname, conn);
                                appendPQExpBuffer(buf, ";\n");
                        }
+               }
 
-                       if (binary_upgrade)
-                       {
-                               appendPQExpBuffer(buf, "-- For binary upgrade, set datfrozenxid.\n");
-                               appendPQExpBuffer(buf, "UPDATE pg_catalog.pg_database "
-                                                                 "SET datfrozenxid = '%u' "
-                                                                 "WHERE datname = ",
-                                                                 dbfrozenxid);
-                               appendStringLiteralConn(buf, dbname, conn);
-                               appendPQExpBuffer(buf, ";\n");
-                       }
+               if (binary_upgrade)
+               {
+                       appendPQExpBuffer(buf, "-- For binary upgrade, set datfrozenxid.\n");
+                       appendPQExpBuffer(buf, "UPDATE pg_catalog.pg_database "
+                                                         "SET datfrozenxid = '%u' "
+                                                         "WHERE datname = ",
+                                                         dbfrozenxid);
+                       appendStringLiteralConn(buf, dbname, conn);
+                       appendPQExpBuffer(buf, ";\n");
                }
 
                if (!skip_acls &&