database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-18 04:29:09 +03:00
Code Activity

Post-feature-freeze pgindent run.

Browse Source 
Discussion: https://postgr.es/m/15719.1523984266@sss.pgh.pa.us
This commit is contained in:
Tom Lane
2018-04-26 14:47:16 -04:00
parent f83bf385c1
commit bdf46af748
167 changed files with 1174 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pg_upgrade/exec.c
View File

@@ -110,6 +110,7 @@ exec_prog(const char *log_file, const char *opt_log_file,
pg_log(PG_VERBOSE, "%s\n", cmd);
#ifdef WIN32
/*
* For some reason, Windows issues a file-in-use error if we write data to
* the log file from a non-primary thread just before we create a
@@ -191,6 +192,7 @@ exec_prog(const char *log_file, const char *opt_log_file,
}
#ifndef WIN32
/*
* We can't do this on Windows because it will keep the "pg_ctl start"
* output filename open until the server stops, so we do the \n\n above on

4
src/bin/pg_upgrade/server.c
View File

@@ -309,8 +309,8 @@ start_postmaster(ClusterInfo *cluster, bool report_and_exit_on_error)
/*
* If pg_ctl failed, and the connection didn't fail, and
* report_and_exit_on_error is enabled, fail now. This
* could happen if the server was already running.
* report_and_exit_on_error is enabled, fail now. This could happen if
* the server was already running.
*/
if (!pg_ctl_return)
{