diff options
author | Bruce Momjian <bruce@momjian.us> | 2020-12-27 21:37:42 -0500 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2020-12-27 21:37:42 -0500 |
commit | 3187ef7c46c5b884267a88f2d6119c9a05f1bbba (patch) | |
tree | 6ff5e31d8ffaaf806ee908fe2ef8733c7ba348ef /src/bin/pg_upgrade/server.c | |
parent | facad31474ac6dace3894ebc7c45dc3cc829422e (diff) | |
download | postgresql-3187ef7c46c5b884267a88f2d6119c9a05f1bbba.tar.gz postgresql-3187ef7c46c5b884267a88f2d6119c9a05f1bbba.zip |
Revert "Add key management system" (978f869b99) & later commits
The patch needs test cases, reorganization, and cfbot testing.
Technically reverts commits 5c31afc49d..e35b2bad1a (exclusive/inclusive)
and 08db7c63f3..ccbe34139b.
Reported-by: Tom Lane, Michael Paquier
Discussion: https://postgr.es/m/E1ktAAG-0002V2-VB@gemulon.postgresql.org
Diffstat (limited to 'src/bin/pg_upgrade/server.c')
-rw-r--r-- | src/bin/pg_upgrade/server.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c index 9208ad0d8a3..713509f5406 100644 --- a/src/bin/pg_upgrade/server.c +++ b/src/bin/pg_upgrade/server.c @@ -244,9 +244,8 @@ start_postmaster(ClusterInfo *cluster, bool report_and_exit_on_error) * vacuumdb --freeze actually freezes the tuples. */ snprintf(cmd, sizeof(cmd), - "\"%s/pg_ctl\" -w%s -l \"%s\" -D \"%s\" -o \"-p %d%s%s %s%s\" start", - cluster->bindir, user_opts.pass_terminal_fd ? " -R" : "", - SERVER_LOG_FILE, cluster->pgconfig, cluster->port, + "\"%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" : " -c autovacuum=off -c autovacuum_freeze_max_age=2000000000", |