Skip to content
Snippets Groups Projects
Commit 6b700301 authored by Andres Freund's avatar Andres Freund
Browse files

Fix wrong merge resolution making pg_receivexlog fail in 9.2.

I bungled resolving a conflict while backpatching 2c0a4858 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.
parent 3913b897
No related branches found
No related tags found
No related merge requests found
......@@ -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);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment