Skip to content

Commit 448a333

Browse files
committed
Fix name collision in c64086b
Reported-by: Erik Rijkers, Tom Lane Discussion: https://postgr.es/m/E1rQqeS-002A0s-Qm%40gemulon.postgresql.org
1 parent b2a296b commit 448a333

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/backend/storage/ipc/procarray.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ void
10531053
ProcArrayApplyRecoveryInfo(RunningTransactions running)
10541054
{
10551055
TransactionId *xids;
1056-
TransactionId xid;
1056+
TransactionId advanceNextXid;
10571057
int nxids;
10581058
int i;
10591059

@@ -1072,9 +1072,9 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
10721072
* because we will need it up to date for accessing two-phase transactions
10731073
* in StandbyReleaseOldLocks().
10741074
*/
1075-
xid = running->nextXid;
1076-
TransactionIdRetreat(xid);
1077-
AdvanceNextFullTransactionIdPastXid(xid);
1075+
advanceNextXid = running->nextXid;
1076+
TransactionIdRetreat(advanceNextXid);
1077+
AdvanceNextFullTransactionIdPastXid(advanceNextXid);
10781078
Assert(FullTransactionIdIsValid(TransamVariables->nextXid));
10791079

10801080
/*

0 commit comments

Comments
 (0)