From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 5 Feb 2012 03:32:35 +0000 (-0500)
Subject: Add missing Assert and fix inaccurate elog message in standby_redo().
X-Git-Tag: REL9_2_BETA1~475
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2af72cefeaa15e27277d327783fdec2748d9b758;p=postgresql

Add missing Assert and fix inaccurate elog message in standby_redo().

All other WAL redo routines either call RestoreBkpBlocks() or Assert that
they haven't been passed any backup blocks.  Make this one do likewise.
Also, fix incorrect routine name in its failure message.
---

diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index dc6833b3b1..2924d0ff65 100644
--- a/src/backend/storage/ipc/standby.c
+++ b/src/backend/storage/ipc/standby.c
@@ -718,6 +718,9 @@ standby_redo(XLogRecPtr lsn, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 
+	/* Backup blocks are not used in standby records */
+	Assert(!(record->xl_info & XLR_BKP_BLOCK_MASK));
+
 	/* Do nothing if we're not in hot standby mode */
 	if (standbyState == STANDBY_DISABLED)
 		return;
@@ -747,7 +750,7 @@ standby_redo(XLogRecPtr lsn, XLogRecord *record)
 		ProcArrayApplyRecoveryInfo(&running);
 	}
 	else
-		elog(PANIC, "relation_redo: unknown op code %u", info);
+		elog(PANIC, "standby_redo: unknown op code %u", info);
 }
 
 static void