Fix name collision in c64086b79dba

Reported-by: Erik Rijkers, Tom Lane
Discussion: https://postgr.es/m/E1rQqeS-002A0s-Qm%40gemulon.postgresql.org
This commit is contained in:
Alexander Korotkov 2024-01-19 18:13:33 +02:00
parent b2a296b0cf
commit 448a3331d9

View File

@ -1053,7 +1053,7 @@ void
ProcArrayApplyRecoveryInfo(RunningTransactions running) ProcArrayApplyRecoveryInfo(RunningTransactions running)
{ {
TransactionId *xids; TransactionId *xids;
TransactionId xid; TransactionId advanceNextXid;
int nxids; int nxids;
int i; int i;
@ -1072,9 +1072,9 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
* because we will need it up to date for accessing two-phase transactions * because we will need it up to date for accessing two-phase transactions
* in StandbyReleaseOldLocks(). * in StandbyReleaseOldLocks().
*/ */
xid = running->nextXid; advanceNextXid = running->nextXid;
TransactionIdRetreat(xid); TransactionIdRetreat(advanceNextXid);
AdvanceNextFullTransactionIdPastXid(xid); AdvanceNextFullTransactionIdPastXid(advanceNextXid);
Assert(FullTransactionIdIsValid(TransamVariables->nextXid)); Assert(FullTransactionIdIsValid(TransamVariables->nextXid));
/* /*