Commit959ee6d

committed

pg_upgrade: simplify code layout in a few places

Backpatch-through: 9.4 (9.3 didn't need improving)

1 parentdf9f682 commit959ee6dCopy full SHA for 959ee6d

File tree

-8

lines changed

-8

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,6 @@ exec_prog(const char log_file, const char opt_log_file,`
`112`	`112`	`pg_log(PG_VERBOSE,"%s\n",cmd);`
`113`	`113`
`114`	`114`	`#ifdefWIN32`
`115`		`-`
`116`	`115`	`/*`
`117`	`116`	`* For some reason, Windows issues a file-in-use error if we write data to`
`118`	`117`	`* the log file from a non-primary thread just before we create a`
`@@ -194,7 +193,6 @@ exec_prog(const char log_file, const char opt_log_file,`
`194`	`193`	`}`
`195`	`194`
`196`	`195`	`#ifndefWIN32`
`197`		`-`
`198`	`196`	`/*`
`199`	`197`	`* We can't do this on Windows because it will keep the "pg_ctl start"`
`200`	`198`	`* output filename open until the server stops, so we do the \n\n above on`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -310,12 +310,8 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)`
`310`	`310`	`* running.`
`311`	`311`	`*/`
`312`	`312`	`if (!pg_ctl_return)`
`313`		`-{`
`314`		`-if (cluster==&old_cluster)`
`315`		`-pg_fatal("pg_ctl failed to start the source server, or connection failed\n");`
`316`		`-else`
`317`		`-pg_fatal("pg_ctl failed to start the target server, or connection failed\n");`
`318`		`-}`
	`313`	`+pg_fatal("pg_ctl failed to start the %s server, or connection failed\n",`
	`314`	`+cluster==&old_cluster ?"source" :"target");`
`319`	`315`
`320`	`316`	`return true;`
`321`	`317`	`}`

Comments

(0)