Fix wrong merge resolution making pg_receivexlog fail in 9.2.

anarazel · anarazel · commit 6b700301c36e · 2015-02-17T16:03:00.000+01:00
I bungled resolving a conflict while backpatching 2c0a485 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.
diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c
@@ -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);
 }

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ StreamLog(void)`
`321`	`321`	`progname, startpos.xlogid, startpos.xrecoff, timeline);`
`322`	`322`
`323`	`323`	`ReceiveXlogStream(conn, startpos, timeline, NULL, basedir,`
`324`		`- stop_streaming, standby_message_timeout, false, true);`
	`324`	`+ stop_streaming, standby_message_timeout, false, false);`
`325`	`325`
`326`	`326`	`PQfinish(conn);`
`327`	`327`	`}`