database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

Rename pg_upgrade 'log' to 'log_opts', to avoid platform naming conflict.

Browse Source
This commit is contained in:
Bruce Momjian
2010-10-20 02:31:17 +00:00
parent 3325c9bddb
commit 691a67b922
8 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/pg_upgrade/server.c
View File

@ -185,7 +185,7 @@ start_postmaster(Cluster whichCluster, bool quiet)
"start >> \"%s\" 2>&1" SYSTEMQUOTE,
bindir,
#ifndef WIN32
log.filename, datadir, port, log.filename);
log_opts.filename, datadir, port, log_opts.filename);
#else
DEVNULL, datadir, port, DEVNULL);
#endif
@ -229,7 +229,7 @@ stop_postmaster(bool fast, bool quiet)
"\"%s\" 2>&1" SYSTEMQUOTE,
bindir,
#ifndef WIN32
log.filename, datadir, fast ? "-m fast" : "", log.filename);
log_opts.filename, datadir, fast ? "-m fast" : "", log_opts.filename);
#else
DEVNULL, datadir, fast ? "-m fast" : "", DEVNULL);
#endif