diff options
| author | Peter Eisentraut | 2017-01-13 17:00:00 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2017-01-14 02:25:36 +0000 |
| commit | e574f15d6295b12c03ef8810c00976b65933711a (patch) | |
| tree | 1cc705093b799a1bf3af211e8d96437609cb7f7d /src/bin | |
| parent | 5ad966ab1c50e829462f2b3e3ffa59e2d95479e6 (diff) | |
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/bin')
| -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 |
2 files changed, 6 insertions, 6 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; |