diff options
Diffstat (limited to 'src/backend/storage/lmgr')
| -rw-r--r-- | src/backend/storage/lmgr/lmgr.c | 10 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/lock.c | 6 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/multi.c | 12 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/proc.c | 10 |
4 files changed, 19 insertions, 19 deletions
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index c9481d09f86..c841d34bb1f 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.10 1998/01/05 03:33:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.11 1998/01/07 21:05:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -434,7 +434,7 @@ RelationUnsetLockForRead(Relation relation) */ if (!LockInfoIsValid(linfo)) { - elog(ABORT, + elog(ERROR, "Releasing a lock on %s with invalid lock information", RelationGetRelationName(relation)); } @@ -527,7 +527,7 @@ RelationUnsetLockForWrite(Relation relation) if (!LockInfoIsValid(linfo)) { - elog(ABORT, + elog(ERROR, "Releasing a lock on %s with invalid lock information", RelationGetRelationName(relation)); } @@ -769,7 +769,7 @@ RelationUnsetSingleWLockPage(Relation relation, return; if (!LockInfoIsValid(relation->lockInfo)) - elog(ABORT, + elog(ERROR, "Releasing a lock on %s with invalid lock information", RelationGetRelationName(relation)); @@ -816,7 +816,7 @@ RelationUnsetSingleRLockPage(Relation relation, return; if (!LockInfoIsValid(relation->lockInfo)) - elog(ABORT, + elog(ERROR, "Releasing a lock on %s with invalid lock information", RelationGetRelationName(relation)); diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 9d41201dd4f..20573292227 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.17 1998/01/05 03:33:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.18 1998/01/07 21:05:32 momjian Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -802,7 +802,7 @@ WaitOnLock(LOCKTAB *ltable, LockTableId tableId, LOCK *lock, LOCKT lockt) lock->holders[lockt]--; LOCK_DUMP_AUX("WaitOnLock: aborting on lock", lock, lockt); SpinRelease(ltable->ctl->masterLock); - elog(ABORT, "WaitOnLock: error on wakeup - Aborting this transaction"); + elog(ERROR, "WaitOnLock: error on wakeup - Aborting this transaction"); } LOCK_DUMP_AUX("WaitOnLock: wakeup on lock", lock, lockt); @@ -887,7 +887,7 @@ LockRelease(LockTableId tableId, LOCKTAG *lockName, LOCKT lockt) #endif /* - * let the caller print its own error message, too. Do not elog(ABORT). + * let the caller print its own error message, too. Do not elog(ERROR). */ if (!lock) { diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c index 5786cadd64e..1916b102acf 100644 --- a/src/backend/storage/lmgr/multi.c +++ b/src/backend/storage/lmgr/multi.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.9 1998/01/05 03:33:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.10 1998/01/07 21:05:35 momjian Exp $ * * NOTES: * (1) The lock.c module assumes that the caller here is doing @@ -100,14 +100,14 @@ InitMultiLevelLockm() MultiTableId = tableId; if (!(MultiTableId)) { - elog(ABORT, "InitMultiLockm: couldnt initialize lock table"); + elog(ERROR, "InitMultiLockm: couldnt initialize lock table"); } /* ----------------------- * No short term lock table for now. -Jeff 15 July 1991 * * ShortTermTableId = LockTabRename(tableId); * if (! (ShortTermTableId)) { - * elog(ABORT,"InitMultiLockm: couldnt rename lock table"); + * elog(ERROR,"InitMultiLockm: couldnt rename lock table"); * } * ----------------------- */ @@ -237,7 +237,7 @@ MultiAcquire(LockTableId tableId, locks[2] = lockt; break; default: - elog(ABORT, "MultiAcquire: bad lock level"); + elog(ERROR, "MultiAcquire: bad lock level"); return (FALSE); } @@ -390,7 +390,7 @@ MultiRelease(LockTableId tableId, locks[2] = lockt; break; default: - elog(ABORT, "MultiRelease: bad lockt"); + elog(ERROR, "MultiRelease: bad lockt"); } /* @@ -435,7 +435,7 @@ MultiRelease(LockTableId tableId, status = LockRelease(tableId, tmpTag, locks[i]); if (!status) { - elog(ABORT, "MultiRelease: couldn't release after error"); + elog(ERROR, "MultiRelease: couldn't release after error"); } } } diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index f5baaa3eb9d..7d91398b228 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.24 1998/01/05 03:33:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.25 1998/01/07 21:05:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ * This is so that we can support more backends. (system-wide semaphore * sets run out pretty fast.) -ay 4/95 * - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.24 1998/01/05 03:33:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.25 1998/01/07 21:05:36 momjian Exp $ */ #include <sys/time.h> #include <unistd.h> @@ -163,13 +163,13 @@ InitProcess(IPCKey key) if (!found) { /* this should not happen. InitProcGlobal() is called before this. */ - elog(ABORT, "InitProcess: Proc Header uninitialized"); + elog(ERROR, "InitProcess: Proc Header uninitialized"); } if (MyProc != NULL) { SpinRelease(ProcStructLock); - elog(ABORT, "ProcInit: you already exist"); + elog(ERROR, "ProcInit: you already exist"); return; } @@ -803,7 +803,7 @@ ProcGetNewSemKeyAndNum(IPCKey *key, int *semNum) } /* if we reach here, all the semaphores are in use. */ - elog(ABORT, "InitProc: cannot allocate a free semaphore"); + elog(ERROR, "InitProc: cannot allocate a free semaphore"); } /* |