Fix compilation with WAL_DEBUG.

anarazel · anarazel · commit 3536b851adb2 · 2022-04-06T23:26:59.000-07:00
Broke with 5c279a6. But looks like it had been half-broken since 70e8186, because 'rmid' didn't refer to the current record's rmid anymore, but to rmid from "Initialize resource managers" - a constant.
diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c
@@ -1634,8 +1634,8 @@ PerformWalRecovery(void)
 
 #ifdef WAL_DEBUG
 			if (XLOG_DEBUG ||
-				(rmid == RM_XACT_ID && trace_recovery_messages <= DEBUG2) ||
-				(rmid != RM_XACT_ID && trace_recovery_messages <= DEBUG3))
+				(record->xl_rmid == RM_XACT_ID && trace_recovery_messages <= DEBUG2) ||
+				(record->xl_rmid != RM_XACT_ID && trace_recovery_messages <= DEBUG3))
 			{
 				StringInfoData buf;
 

Original file line number	Diff line number	Diff line change
`@@ -1634,8 +1634,8 @@ PerformWalRecovery(void)`
`1634`	`1634`
`1635`	`1635`	`#ifdef WAL_DEBUG`
`1636`	`1636`	`if (XLOG_DEBUG \|\|`
`1637`		`- (rmid == RM_XACT_ID && trace_recovery_messages <= DEBUG2) \|\|`
`1638`		`- (rmid != RM_XACT_ID && trace_recovery_messages <= DEBUG3))`
	`1637`	`+ (record->xl_rmid == RM_XACT_ID && trace_recovery_messages <= DEBUG2) \|\|`
	`1638`	`+ (record->xl_rmid != RM_XACT_ID && trace_recovery_messages <= DEBUG3))`
`1639`	`1639`	`{`
`1640`	`1640`	`StringInfoData buf;`
`1641`	`1641`