Fix pg_upgrade -O/-o options

Fix previous commit that added synchronous_commit=off, but broke -O/-o
due to missing space in argument passing.

Backpatch to 9.2.

diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
index 49d4c8f9d739791fb0d9bdbe2ee35dec7dc3ec5b..0940e00a725c67a4c37f4c2b6cee3a136f382fe0 100644 (file)
--- a/contrib/pg_upgrade/server.c
+++ b/contrib/pg_upgrade/server.c
@@ -214,7 +214,7 @@ start_postmaster(ClusterInfo *cluster)
         *      the new cluster has to be recreated anyway.
         */
        snprintf(cmd, sizeof(cmd),
-                        "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" -o \"-p %d%s%s%s%s\" start",
+                        "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" -o \"-p %d%s%s %s%s\" start",
                  cluster->bindir, SERVER_LOG_FILE, cluster->pgconfig, cluster->port,
                         (cluster->controldata.cat_ver >=
                          BINARY_UPGRADE_SERVER_FLAG_CAT_VER) ? " -b" :