From: Simon Riggs <simon@2ndQuadrant.com>
Date: Wed, 8 Aug 2012 20:28:41 +0000 (+0100)
Subject: Fix minor bug in XLogFileRead() that accidentally worked.
X-Git-Tag: REL9_2_BETA4~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df09dbbcaa546350a78ce9f096b872fa3a28cafb;p=postgresql

Fix minor bug in XLogFileRead() that accidentally worked.
Cascading replication copied the incoming file into pg_xlog but
didn't set path correctly, so the first attempt to open file failed
causing it to loop around and look for file in pg_xlog. So the
earlier coding worked, but accidentally rather than by design.

Spotted by Fujii Masao, fix by Fujii Masao and Simon Riggs
---

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 37c0eda510..7b9b483ed9 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -2809,6 +2809,11 @@ XLogFileRead(uint32 log, uint32 seg, int emode, TimeLineID tli,
 					 errmsg("could not rename file \"%s\" to \"%s\": %m",
 							path, xlogfpath)));
 
+		/*
+		 * Set path to point at the new file in pg_xlog.
+		 */
+		strncpy(path, xlogfpath, MAXPGPATH);
+
 		/*
 		 * If the existing segment was replaced, since walsenders might have
 		 * it open, request them to reload a currently-open segment.