Revert:

    In pg_upgrade, remove pg_restore's --single-transaction option,
    as it throws errors in certain cases.

diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
index 3f222821589c0c4a9b59ffc5eabbbd0709a2cdd0..c12f15b875bc7dad49ab6e2baa30f57f1b0e1c58 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -309,12 +309,11 @@ create_new_objects(void)
 
        /*
         *  Using pg_restore --single-transaction is faster than other
-        *  methods, like --jobs.  However, --single-transaction throws
-        *  an error.  pg_dump only produces its output at the
+        *  methods, like --jobs.  pg_dump only produces its output at the
         *  end, so there is little parallelism using the pipe.
         */
        exec_prog(RESTORE_LOG_FILE, NULL, true,
-                 "\"%s/pg_restore\" %s --exit-on-error --verbose --dbname \"%s\" \"%s\"",
+                 "\"%s/pg_restore\" %s --exit-on-error --single-transaction --verbose --dbname \"%s\" \"%s\"",
                  new_cluster.bindir, cluster_conn_opts(&new_cluster),
                  old_db->db_name, file_name);
    }