]> granicus.if.org Git - postgresql/commit
Fix wrong merge resolution making pg_receivexlog fail in 9.2.
authorAndres Freund <andres@anarazel.de>
Tue, 17 Feb 2015 15:03:00 +0000 (16:03 +0100)
committerAndres Freund <andres@anarazel.de>
Tue, 17 Feb 2015 15:03:00 +0000 (16:03 +0100)
commit6b700301c36e380eb4972ab72c0e914cae60f9fd
treeda4b95d73e3a7a9f4bab44a37d709e5f1fb9c224
parent3913b897d61975e2b2b7e0ac32b3b6f657eb2c5f
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.
src/bin/pg_basebackup/pg_receivexlog.c