Commitf82b3e5

committed

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

1 parent30aeda4 commitf82b3e5Copy full SHA for f82b3e5

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ relarr_lookup_rel(RelInfoArr rel_arr, const char nspname,`
`441`	`441`	`}`
`442`	`442`	`}`
`443`	`443`	`pg_log(PG_FATAL,"Could not find %s.%s in %s cluster\n",`
`444`		`-nspname,relname,CLUSTERNAME(whichCluster));`
	`444`	`+nspname,relname,CLUSTER_NAME(whichCluster));`
`445`	`445`	`returnNULL;`
`446`	`446`	`}`
`447`	`447`
`@@ -465,7 +465,7 @@ relarr_lookup_reloid(RelInfoArr *rel_arr, Oid oid,`
`465`	`465`	`return&rel_arr->rels[relnum];`
`466`	`466`	`}`
`467`	`467`	`pg_log(PG_FATAL,"Could not find %d in %s cluster\n",`
`468`		`-oid,CLUSTERNAME(whichCluster));`
	`468`	`+oid,CLUSTER_NAME(whichCluster));`
`469`	`469`	`returnNULL;`
`470`	`470`	`}`
`471`	`471`
`@@ -495,7 +495,7 @@ dbarr_print(DbInfoArr *arr, Cluster whichCluster)`
`495`	`495`	`{`
`496`	`496`	`intdbnum;`
`497`	`497`
`498`		`-pg_log(PG_DEBUG,"%s databases\n",CLUSTERNAME(whichCluster));`
	`498`	`+pg_log(PG_DEBUG,"%s databases\n",CLUSTER_NAME(whichCluster));`
`499`	`499`
`500`	`500`	`for (dbnum=0;dbnum<arr->ndbs;dbnum++)`
`501`	`501`	`{`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`#defineEXE_EXT".exe"`
`53`	`53`	`#endif`
`54`	`54`
`55`		`-#defineCLUSTERNAME(cluster)((cluster) == CLUSTER_OLD ? "old" : "new")`
	`55`	`+#defineCLUSTER_NAME(cluster)((cluster) == CLUSTER_OLD ? "old" : "new")`
`56`	`56`	`#defineACTIVE_CLUSTER(cluster) (((cluster) == CLUSTER_OLD) ? \`
`57`	`57`	`&old_cluster : &new_cluster)`
`58`	`58`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ start_postmaster(Cluster whichCluster, bool quiet)`
`195`	`195`
`196`	`196`	`if (test_server_conn(POSTMASTER_UPTIME,whichCluster)== false)`
`197`	`197`	`pg_log(PG_FATAL," Unable to start %s postmaster with the command: %s\nPerhaps pg_hba.conf was not set to \"trust\".",`
`198`		`-CLUSTERNAME(whichCluster),cmd);`
	`198`	`+CLUSTER_NAME(whichCluster),cmd);`
`199`	`199`
`200`	`200`	`if ((os_info.postmasterPID=get_postmaster_pid(datadir))==0)`
`201`	`201`	`pg_log(PG_FATAL," Unable to get postmaster pid\n");`
`@@ -275,7 +275,7 @@ test_server_conn(int timeout, Cluster whichCluster)`
`275`	`275`
`276`	`276`	`if (tries==STARTUP_WARNING_TRIES)`
`277`	`277`	`prep_status("Trying to start %s server ",`
`278`		`-CLUSTERNAME(whichCluster));`
	`278`	`+CLUSTER_NAME(whichCluster));`
`279`	`279`	`elseif (tries>STARTUP_WARNING_TRIES)`
`280`	`280`	`pg_log(PG_REPORT,".");`
`281`	`281`	`}`

Comments

(0)