database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Fix wrong merge resolution making pg_receivexlog fail in 9.2.

Browse Source 
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.
This commit is contained in:
Andres Freund
2015-02-17 16:03:00 +01:00
parent 3913b897d6
commit 6b700301c3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pg_basebackup/pg_receivexlog.c
View File

@@ -321,7 +321,7 @@ StreamLog(void)
progname, startpos.xlogid, startpos.xrecoff, timeline); progname, startpos.xlogid, startpos.xrecoff, timeline);
ReceiveXlogStream(conn, startpos, timeline, NULL, basedir, ReceiveXlogStream(conn, startpos, timeline, NULL, basedir,
stop_streaming, standby_message_timeout, false, true); stop_streaming, standby_message_timeout, false, false);
PQfinish(conn); PQfinish(conn);
} }