diff options
| author | Bruce Momjian <bruce@momjian.us> | 2012-05-25 09:09:51 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2012-05-25 09:10:07 -0400 |
| commit | 45ca31d6a7eaf91dc65fd5cf2b140320feb3fa3f (patch) | |
| tree | 6b59251fd7a513bfd69c3ad1b86b33ec9ba78e3b | |
| parent | 31d965819bdaa971ae007a67611e78ec1d185f14 (diff) | |
| download | postgresql-45ca31d6a7eaf91dc65fd5cf2b140320feb3fa3f.tar.gz postgresql-45ca31d6a7eaf91dc65fd5cf2b140320feb3fa3f.zip | |
Have pg_upgrade only use one extra log file for Win32, not two.
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.c | 2 | ||||
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c index 3df383614e8..465ecdd6b32 100644 --- a/contrib/pg_upgrade/pg_upgrade.c +++ b/contrib/pg_upgrade/pg_upgrade.c @@ -58,8 +58,8 @@ OSInfo os_info; char *output_files[] = { SERVER_LOG_FILE, #ifdef WIN32 + /* unique file for pg_ctl start */ SERVER_START_LOG_FILE, - SERVER_STOP_LOG_FILE, #endif RESTORE_LOG_FILE, UTILITY_LOG_FILE, diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h index 5891997e79f..26aa7bb1d24 100644 --- a/contrib/pg_upgrade/pg_upgrade.h +++ b/contrib/pg_upgrade/pg_upgrade.h @@ -63,7 +63,8 @@ extern char *output_files[]; #define SERVER_STOP_LOG_FILE SERVER_LOG_FILE #else #define SERVER_START_LOG_FILE "pg_upgrade_server_start.log" -#define SERVER_STOP_LOG_FILE "pg_upgrade_server_stop.log" +/* pg_ctl stop doesn't keep the log file open, so reuse UTILITY_LOG_FILE */ +#define SERVER_STOP_LOG_FILE UTILITY_LOG_FILE #endif |