Fix recreation of sequence files for 7.2 also because of XID change from

beta4 to beta5.

diff --git a/src/bin/pg_dump/pg_upgrade b/src/bin/pg_dump/pg_upgrade
index 86e2b0a030b052e13b00b54283a61f05c53e5098..b20471b31e2552ded858ffb2c1b354c7cfb0cbcc 100755 (executable)
--- a/src/bin/pg_dump/pg_upgrade
+++ b/src/bin/pg_dump/pg_upgrade
@@ -70,8 +70,10 @@ make_dbobjoidmap()
                                WHERE   relkind = 'r' OR
                                        relkind = 'i' OR
                                        relkind = 't'\"`"
-               # Don't move over 7.1 sequences;  use setval() file
-               if [ "$SRC_VERSION" != "7.1" ]
+               # Don't move over 7.1 int4 sequences;  use setval() file.
+               # Sequence XIDs changed from 7.2beta4 to beta5;  don't copy them.
+               if [ "$SRC_VERSION" != "7.1" -a \
+                    "$SRC_VERSION" != "7.2" ]
                then    QUERY="$QUERY OR relkind = 'S';";
                        QUERY="$QUERY;"
                fi
@@ -213,8 +215,9 @@ $0 aborted." 1>&2
        make_dbobjoidmap > "$INFODIR"/dbobjoidmap
 
        # Generate setval() script for 7.1 because it has int4 sequences
-
-       if [ "$SRC_VERSION" = "7.1" ]
+       # Sequence XIDs changed from 7.2beta4 to beta5;  we have to recreate them.
+       if [ "$SRC_VERSION" = "7.1" -o \
+            "$SRC_VERSION" = "7.2" ]
        then
                psql -d template1 -At -c "SELECT datname FROM pg_database" |
                grep -v '^template0$' |
@@ -511,8 +514,9 @@ fi
 
 # Set sequence values for 7.1-version sequences, which were int4.
 
-if [ "$SRC_VERSION" = "7.1" ]
-then   echo "Set int8 sequence values from 7.1..."
+if [ "$SRC_VERSION" = "7.1" -o \
+     "$SRC_VERSION" = "7.2" ]
+then   echo "Set sequence values..."
        psql -d template1 -At < "$INFODIR"/setval
        if [ $? -ne 0 ]
        then    echo "There were errors during int4 sequence restore.