Fix name collision in c64086b

akorotkov · akorotkov · commit 448a3331d9ab · 2024-01-19T18:17:13.000+02:00
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
@@ -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));
 
 	/*
