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 93cdc97166c53c2303ff6a1a4e7000c036b0afc3..ee2d7f8585a8d01301af23423922c8a5c197724e 100644 (file)
--- 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));
 
        /*