From: Alexander Korotkov <akorotkov@postgresql.org>
Date: Fri, 19 Jan 2024 16:13:33 +0000 (+0200)
Subject: Fix name collision in c64086b79dba
X-Git-Tag: REL_17_BETA1~1062
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=448a3331d9ab3094183cea59f601b6f2f7f7c48a;p=thirdparty%2Fpostgresql.git

Fix name collision in c64086b79dba

Reported-by: Erik Rijkers, Tom Lane
Discussion: https://postgr.es/m/E1rQqeS-002A0s-Qm%40gemulon.postgresql.org
---

diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index 93cdc97166c..ee2d7f8585a 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -1053,7 +1053,7 @@ void
 ProcArrayApplyRecoveryInfo(RunningTransactions running)
 {
 	TransactionId *xids;
-	TransactionId xid;
+	TransactionId advanceNextXid;
 	int			nxids;
 	int			i;
 
@@ -1072,9 +1072,9 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
 	 * because we will need it up to date for accessing two-phase transactions
 	 * in StandbyReleaseOldLocks().
 	 */
-	xid = running->nextXid;
-	TransactionIdRetreat(xid);
-	AdvanceNextFullTransactionIdPastXid(xid);
+	advanceNextXid = running->nextXid;
+	TransactionIdRetreat(advanceNextXid);
+	AdvanceNextFullTransactionIdPastXid(advanceNextXid);
 	Assert(FullTransactionIdIsValid(TransamVariables->nextXid));
 
 	/*