diff options
| author | Bruce Momjian <bruce@momjian.us> | 2012-12-01 10:21:45 -0500 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2012-12-01 10:21:45 -0500 |
| commit | 1c59e376652bc86d72126cafd6d9831d8a188f79 (patch) | |
| tree | 6cf8c1c736b50025170b76f09d1c2db3b2036c15 | |
| parent | 209772350b69f816e291b14b072f6e3862a0b4e0 (diff) | |
| download | postgresql-1c59e376652bc86d72126cafd6d9831d8a188f79.tar.gz postgresql-1c59e376652bc86d72126cafd6d9831d8a188f79.zip | |
Revert:
In pg_upgrade, remove pg_restore's --single-transaction option,
as it throws errors in certain cases.
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c index 3f222821589..c12f15b875b 100644 --- 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); } |