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.

diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c
index 8167aebe9d939befe235b60dee5449d59395c736..8d6c624a9b65e8ad8edfa25a5509f9512878e875 100644 (file)
--- 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);
 }