database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

In pg_upgrade, rename "CLUSTERNAME" to "CLUSTER_NAME".

Browse Source
This commit is contained in:
Bruce Momjian
2010-12-31 20:42:29 -05:00
parent 30aeda4394
commit f82b3e58f8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/pg_upgrade/server.c
View File

@ -195,7 +195,7 @@ start_postmaster(Cluster whichCluster, bool quiet)
if (test_server_conn(POSTMASTER_UPTIME, whichCluster) == false)
pg_log(PG_FATAL, " Unable to start %s postmaster with the command: %s\nPerhaps pg_hba.conf was not set to \"trust\".",
CLUSTERNAME(whichCluster), cmd);
CLUSTER_NAME(whichCluster), cmd);
if ((os_info.postmasterPID = get_postmaster_pid(datadir)) == 0)
pg_log(PG_FATAL, " Unable to get postmaster pid\n");
@ -275,7 +275,7 @@ test_server_conn(int timeout, Cluster whichCluster)
if (tries == STARTUP_WARNING_TRIES)
prep_status("Trying to start %s server ",
CLUSTERNAME(whichCluster));
CLUSTER_NAME(whichCluster));
else if (tries > STARTUP_WARNING_TRIES)
pg_log(PG_REPORT, ".");
}