Fix wrong merge resolution making pg_receivexlog fail in 9.2.

Andres Freund <andres@anarazel.de>

Commit: 6b700301c36e380eb4972ab72c0e914cae60f9fd
Author: Andres Freund <andres@anarazel.de>
Date: 2015-02-17T15:03:00Z
Releases: 9.2.11
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.

Files

PathChange+/−
src/bin/pg_basebackup/pg_receivexlog.c modified +1 −1