diff options
| author | Alexander Korotkov <akorotkov@postgresql.org> | 2024-01-19 18:13:33 +0200 |
|---|---|---|
| committer | Alexander Korotkov <akorotkov@postgresql.org> | 2024-01-19 18:17:13 +0200 |
| commit | 448a3331d9ab3094183cea59f601b6f2f7f7c48a (patch) | |
| tree | b29bb63681479687e40afdb8340b53b365cbcd59 | |
| parent | b2a296b0cf731b5a26a784cefaed7f013ed3d6e7 (diff) | |
| download | postgresql-448a3331d9ab3094183cea59f601b6f2f7f7c48a.tar.gz postgresql-448a3331d9ab3094183cea59f601b6f2f7f7c48a.zip | |
Fix name collision in c64086b79dba
Reported-by: Erik Rijkers, Tom Lane
Discussion: https://postgr.es/m/E1rQqeS-002A0s-Qm%40gemulon.postgresql.org
| -rw-r--r-- | src/backend/storage/ipc/procarray.c | 8 |
1 files changed, 4 insertions, 4 deletions
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)); /* |