mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-03 09:13:20 +03:00 
			
		
		
		
	Fix name collision in c64086b79d
				
					
				
			Reported-by: Erik Rijkers, Tom Lane Discussion: https://postgr.es/m/E1rQqeS-002A0s-Qm%40gemulon.postgresql.org
This commit is contained in:
		@@ -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));
 | 
			
		||||
 | 
			
		||||
	/*
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user