diff options
Diffstat (limited to 'src/backend/storage')
| -rw-r--r-- | src/backend/storage/buffer/bufmgr.c | 5 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/lmgr.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 9b7a41b4cb8..f0b397dbea4 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.53 1999/05/29 03:58:43 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.54 1999/06/10 14:17:09 vadim Exp $ * *------------------------------------------------------------------------- */ @@ -2007,7 +2007,8 @@ LockBuffer(Buffer buffer, int mode) else if (BufferLocks[buffer - 1] & BL_W_LOCK) { Assert(buf->w_lock); - Assert(buf->r_locks == 0 && !buf->ri_lock); + Assert(buf->r_locks == 0); + Assert(!buf->ri_lock); Assert(!(BufferLocks[buffer - 1] & (BL_R_LOCK | BL_RI_LOCK))) buf->w_lock = false; BufferLocks[buffer - 1] &= ~BL_W_LOCK; diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index f7ab4acffb4..58ee47fe611 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.26 1999/05/31 01:48:13 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.27 1999/06/10 14:17:11 vadim Exp $ * *------------------------------------------------------------------------- */ @@ -324,8 +324,6 @@ XactLockTableWait(TransactionId xid) LockAcquire(LockTableId, &tag, ShareLock); LockRelease(LockTableId, &tag, ShareLock); - TransactionIdFlushCache(); - /* * Transaction was committed/aborted/crashed - we have to update * pg_log if transaction is still marked as running. |