Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e0f9e2b

Browse files
committed
Fix bug in KnownAssignedXidsMany(). I saw this when looking at the
assertion failure reported by Erik Rijkers, but this alone doesn't explain the failure.
1 parent daaeac8 commit e0f9e2b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/backend/storage/ipc/procarray.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.60 2010/02/26 02:01:00 momjian Exp $
40+
* $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.61 2010/03/11 09:26:59 heikki Exp $
4141
*
4242
*-------------------------------------------------------------------------
4343
*/
@@ -448,6 +448,7 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
448448
/*
449449
* Remove stale transactions, if any.
450450
*/
451+
Assert(TransactionIdIsValid(running->oldestRunningXid));
451452
ExpireOldKnownAssignedTransactionIds(running->oldestRunningXid);
452453
StandbyReleaseOldLocks(running->oldestRunningXid);
453454

@@ -2518,7 +2519,7 @@ KnownAssignedXidsRemoveMany(TransactionId xid, bool keepPreparedXacts)
25182519

25192520
if (!TransactionIdIsValid(xid) || TransactionIdPrecedes(removeXid, xid))
25202521
{
2521-
if (keepPreparedXacts && StandbyTransactionIdIsPrepared(xid))
2522+
if (keepPreparedXacts && StandbyTransactionIdIsPrepared(removeXid))
25222523
continue;
25232524
else
25242525
{

0 commit comments

Comments
 (0)