diff options
| author | Andres Freund | 2015-02-17 15:03:00 +0000 |
|---|---|---|
| committer | Andres Freund | 2015-02-17 15:03:00 +0000 |
| commit | 6b700301c36e380eb4972ab72c0e914cae60f9fd (patch) | |
| tree | da4b95d73e3a7a9f4bab44a37d709e5f1fb9c224 /src/bin | |
| parent | 3913b897d61975e2b2b7e0ac32b3b6f657eb2c5f (diff) | |
Fix wrong merge resolution making pg_receivexlog fail in 9.2.
I bungled resolving a conflict while backpatching 2c0a48589 to 9.2, by
passing mark_done = true to ReceiveXlogStream in pg_receivexlog.c (all
the other branches are ok). Since pg_receivexlog doesn't use a archive
directory that causes 'could not create archive status file "...": No
such file or directory' errors.
Until 9.2.11 is released this can be worked around by creating
'archive_directory' in pg_receivexlog's target directory.
Found by Sergey Konoplev.
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/pg_basebackup/pg_receivexlog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c index 8167aebe9d9..8d6c624a9b6 100644 --- a/src/bin/pg_basebackup/pg_receivexlog.c +++ b/src/bin/pg_basebackup/pg_receivexlog.c @@ -321,7 +321,7 @@ StreamLog(void) progname, startpos.xlogid, startpos.xrecoff, timeline); ReceiveXlogStream(conn, startpos, timeline, NULL, basedir, - stop_streaming, standby_message_timeout, false, true); + stop_streaming, standby_message_timeout, false, false); PQfinish(conn); } |