pgsql: Fix wrong merge resolution making pg_receivexlog fail in 9.2.

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.

Branch
------
REL9_2_STABLE

Details
-------
http://git.postgresql.org/pg/commitdiff/6b700301c36e380eb4972ab72c0e914cae60f9fd

Modified Files
--------------
src/bin/pg_basebackup/pg_receivexlog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)