diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-01-13 12:00:00 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-01-13 21:25:36 -0500 |
| commit | e574f15d6295b12c03ef8810c00976b65933711a (patch) | |
| tree | 1cc705093b799a1bf3af211e8d96437609cb7f7d /src | |
| parent | 5ad966ab1c50e829462f2b3e3ffa59e2d95479e6 (diff) | |
| download | postgresql-e574f15d6295b12c03ef8810c00976b65933711a.tar.gz postgresql-e574f15d6295b12c03ef8810c00976b65933711a.zip | |
Updates to reflect that pg_ctl stop -m fast is the default
Various example and test code used -m fast explicitly, but since it's
the default, this can be omitted now or should be replaced by a better
example.
pg_upgrade is not touched, so it can continue to operate with older
installations.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_ctl/t/001_start_stop.pl | 10 | ||||
| -rw-r--r-- | src/bin/pg_ctl/t/002_status.pl | 2 | ||||
| -rw-r--r-- | src/test/regress/pg_regress.c | 2 | ||||
| -rw-r--r-- | src/tools/msvc/vcregress.pl | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/bin/pg_ctl/t/001_start_stop.pl b/src/bin/pg_ctl/t/001_start_stop.pl index cbe99d79ad5..b328f224877 100644 --- a/src/bin/pg_ctl/t/001_start_stop.pl +++ b/src/bin/pg_ctl/t/001_start_stop.pl @@ -42,14 +42,14 @@ command_ok([ 'pg_ctl', 'start', '-D', "$tempdir/data", '-w' ], sleep 3 if ($windows_os); command_fails([ 'pg_ctl', 'start', '-D', "$tempdir/data", '-w' ], 'second pg_ctl start -w fails'); -command_ok([ 'pg_ctl', 'stop', '-D', "$tempdir/data", '-w', '-m', 'fast' ], +command_ok([ 'pg_ctl', 'stop', '-D', "$tempdir/data", '-w' ], 'pg_ctl stop -w'); -command_fails([ 'pg_ctl', 'stop', '-D', "$tempdir/data", '-w', '-m', 'fast' ], +command_fails([ 'pg_ctl', 'stop', '-D', "$tempdir/data", '-w' ], 'second pg_ctl stop fails'); -command_ok([ 'pg_ctl', 'restart', '-D', "$tempdir/data", '-w', '-m', 'fast' ], +command_ok([ 'pg_ctl', 'restart', '-D', "$tempdir/data", '-w' ], 'pg_ctl restart with server not running'); -command_ok([ 'pg_ctl', 'restart', '-D', "$tempdir/data", '-w', '-m', 'fast' ], +command_ok([ 'pg_ctl', 'restart', '-D', "$tempdir/data", '-w' ], 'pg_ctl restart with server running'); -system_or_bail 'pg_ctl', 'stop', '-D', "$tempdir/data", '-m', 'fast'; +system_or_bail 'pg_ctl', 'stop', '-D', "$tempdir/data"; diff --git a/src/bin/pg_ctl/t/002_status.pl b/src/bin/pg_ctl/t/002_status.pl index 98e171e394f..606d10560fc 100644 --- a/src/bin/pg_ctl/t/002_status.pl +++ b/src/bin/pg_ctl/t/002_status.pl @@ -22,4 +22,4 @@ system_or_bail 'pg_ctl', '-l', "$tempdir/logfile", '-D', command_exit_is([ 'pg_ctl', 'status', '-D', $node->data_dir ], 0, 'pg_ctl status with server running'); -system_or_bail 'pg_ctl', 'stop', '-D', $node->data_dir, '-m', 'fast'; +system_or_bail 'pg_ctl', 'stop', '-D', $node->data_dir; diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index baebcc8c320..d4d00d9c66f 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -265,7 +265,7 @@ stop_postmaster(void) fflush(stderr); snprintf(buf, sizeof(buf), - "\"%s%spg_ctl\" stop -D \"%s/data\" -s -m fast", + "\"%s%spg_ctl\" stop -D \"%s/data\" -s", bindir ? bindir : "", bindir ? "/" : "", temp_instance); diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index bcf22677acd..f575e400529 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -465,7 +465,7 @@ sub upgradecheck @args = ('pg_dumpall', '-f', "$tmp_root/dump1.sql"); system(@args) == 0 or exit 1; print "\nStopping old cluster\n\n"; - system("pg_ctl -m fast stop") == 0 or exit 1; + system("pg_ctl stop") == 0 or exit 1; $ENV{PGDATA} = "$data"; print "\nSetting up new cluster\n\n"; standard_initdb() or exit 1; @@ -483,7 +483,7 @@ sub upgradecheck @args = ('pg_dumpall', '-f', "$tmp_root/dump2.sql"); system(@args) == 0 or exit 1; print "\nStopping new cluster\n\n"; - system("pg_ctl -m fast stop") == 0 or exit 1; + system("pg_ctl stop") == 0 or exit 1; print "\nDeleting old cluster\n\n"; system(".\\delete_old_cluster.bat") == 0 or exit 1; print "\nComparing old and new cluster dumps\n\n"; |