diff options
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/pg_basebackup/pg_basebackup.c | 7 | ||||
| -rw-r--r-- | src/bin/pg_rewind/t/RewindTest.pm | 6 | ||||
| -rw-r--r-- | src/bin/pg_upgrade/TESTING | 2 | ||||
| -rw-r--r-- | src/bin/pg_upgrade/controldata.c | 2 |
4 files changed, 4 insertions, 13 deletions
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index 9f0bede93b9..63f554307cd 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -1681,12 +1681,7 @@ GenerateRecoveryConf(PGconn *conn) initPQExpBuffer(&conninfo_buf); for (option = connOptions; option && option->keyword; option++) { - /* - * Do not emit this setting if: - the setting is "replication", - * "dbname" or "fallback_application_name", since these would be - * overridden by the libpqwalreceiver module anyway. - not set or - * empty. - */ + /* Omit empty settings and those libpqwalreceiver overrides. */ if (strcmp(option->keyword, "replication") == 0 || strcmp(option->keyword, "dbname") == 0 || strcmp(option->keyword, "fallback_application_name") == 0 || diff --git a/src/bin/pg_rewind/t/RewindTest.pm b/src/bin/pg_rewind/t/RewindTest.pm index 61904f25ff4..68b6004e946 100644 --- a/src/bin/pg_rewind/t/RewindTest.pm +++ b/src/bin/pg_rewind/t/RewindTest.pm @@ -26,11 +26,7 @@ package RewindTest; # still running. # # The test script can use the helper functions master_psql and standby_psql -# to run psql against the master and standby servers, respectively. The -# test script can also use the $connstr_master and $connstr_standby global -# variables, which contain libpq connection strings for connecting to the -# master and standby servers. The data directories are also available -# in paths $test_master_datadir and $test_standby_datadir +# to run psql against the master and standby servers, respectively. use strict; use warnings; diff --git a/src/bin/pg_upgrade/TESTING b/src/bin/pg_upgrade/TESTING index 6831f679f66..e69874b42d0 100644 --- a/src/bin/pg_upgrade/TESTING +++ b/src/bin/pg_upgrade/TESTING @@ -36,7 +36,7 @@ Here are the steps needed to create a regression database dump file: 1) Create and populate the regression database in the old cluster. This database can be created by running 'make installcheck' from - src/test/regression. + src/test/regress. 2) Use pg_dump to dump out the regression database. Use the new cluster's pg_dump on the old database to minimize whitespace diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c index 6788f882a84..38236415bef 100644 --- a/src/bin/pg_upgrade/controldata.c +++ b/src/bin/pg_upgrade/controldata.c @@ -105,7 +105,7 @@ get_control_data(ClusterInfo *cluster, bool live_check) #ifndef WIN32 pg_putenv("LANG", NULL); #else - /* On Windows the default locale cannot be English, so force it */ + /* On Windows the default locale may not be English, so force it */ pg_putenv("LANG", "en"); #endif pg_putenv("LANGUAGE", NULL); |