diff options
Diffstat (limited to 'src/backend/access/transam')
| -rw-r--r-- | src/backend/access/transam/transam.c | 8 | ||||
| -rw-r--r-- | src/backend/access/transam/transsup.c | 4 | ||||
| -rw-r--r-- | src/backend/access/transam/varsup.c | 12 | ||||
| -rw-r--r-- | src/backend/access/transam/xact.c | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c index 8985e5ff0c6..e864a2ead33 100644 --- a/src/backend/access/transam/transam.c +++ b/src/backend/access/transam/transam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.15 1998/01/05 03:30:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.16 1998/01/07 21:02:17 momjian Exp $ * * NOTES * This file contains the high level access-method interface to the @@ -183,7 +183,7 @@ TransactionLogTest(TransactionId transactionId, /* transaction id to test */ * here the block didn't contain the information we wanted * ---------------- */ - elog(ABORT, "TransactionLogTest: failed to get xidstatus"); + elog(ERROR, "TransactionLogTest: failed to get xidstatus"); /* * so lint is happy... @@ -308,7 +308,7 @@ TransRecover(Relation logRelation) */ TransGetLastRecordedTransaction(logRelation, logLastXid, &fail); if (fail == true) - elog(ABORT, "TransRecover: failed TransGetLastRecordedTransaction"); + elog(ERROR, "TransRecover: failed TransGetLastRecordedTransaction"); /* ---------------- * next get the "last" and "next" variables @@ -322,7 +322,7 @@ TransRecover(Relation logRelation) * ---------------- */ if (TransactionIdIsLessThan(varNextXid, logLastXid)) - elog(ABORT, "TransRecover: varNextXid < logLastXid"); + elog(ERROR, "TransRecover: varNextXid < logLastXid"); /* ---------------- * intregity test (2) diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c index 4de186da4fd..51879019c89 100644 --- a/src/backend/access/transam/transsup.c +++ b/src/backend/access/transam/transsup.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.15 1998/01/05 03:30:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.16 1998/01/07 21:02:19 momjian Exp $ * * NOTES * This file contains support functions for the high @@ -68,7 +68,7 @@ TransComputeBlockNumber(Relation relation, /* relation to test */ if (relation == LogRelation) itemsPerBlock = TP_NumXidStatusPerBlock; else - elog(ABORT, "TransComputeBlockNumber: unknown relation"); + elog(ERROR, "TransComputeBlockNumber: unknown relation"); /* ---------------- * warning! if the transaction id's get too large diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c index 2474a6ac81a..fcc68fae6da 100644 --- a/src/backend/access/transam/varsup.c +++ b/src/backend/access/transam/varsup.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.14 1998/01/05 03:30:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.15 1998/01/07 21:02:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -69,7 +69,7 @@ VariableRelationGetNextXid(TransactionId *xidP) if (!BufferIsValid(buf)) { SpinRelease(OidGenLockId); - elog(ABORT, "VariableRelationGetNextXid: ReadBuffer failed"); + elog(ERROR, "VariableRelationGetNextXid: ReadBuffer failed"); } var = (VariableRelationContents) BufferGetBlock(buf); @@ -112,7 +112,7 @@ VariableRelationPutNextXid(TransactionId xid) if (!BufferIsValid(buf)) { SpinRelease(OidGenLockId); - elog(ABORT, "VariableRelationPutNextXid: ReadBuffer failed"); + elog(ERROR, "VariableRelationPutNextXid: ReadBuffer failed"); } var = (VariableRelationContents) BufferGetBlock(buf); @@ -164,7 +164,7 @@ VariableRelationGetNextOid(Oid *oid_return) if (!BufferIsValid(buf)) { SpinRelease(OidGenLockId); - elog(ABORT, "VariableRelationGetNextXid: ReadBuffer failed"); + elog(ERROR, "VariableRelationGetNextXid: ReadBuffer failed"); } var = (VariableRelationContents) BufferGetBlock(buf); @@ -224,7 +224,7 @@ VariableRelationPutNextOid(Oid *oidP) if (!PointerIsValid(oidP)) { SpinRelease(OidGenLockId); - elog(ABORT, "VariableRelationPutNextOid: invalid oid pointer"); + elog(ERROR, "VariableRelationPutNextOid: invalid oid pointer"); } /* ---------------- @@ -237,7 +237,7 @@ VariableRelationPutNextOid(Oid *oidP) if (!BufferIsValid(buf)) { SpinRelease(OidGenLockId); - elog(ABORT, "VariableRelationPutNextOid: ReadBuffer failed"); + elog(ERROR, "VariableRelationPutNextOid: ReadBuffer failed"); } var = (VariableRelationContents) BufferGetBlock(buf); diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 119dcd97f47..a88bd514b9f 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.18 1998/01/05 03:30:13 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.19 1998/01/07 21:02:24 momjian Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -497,7 +497,7 @@ CommandCounterIncrement() if (CurrentTransactionStateData.commandId == FirstCommandId) { CommandIdCounterOverflowFlag = true; - elog(ABORT, "You may only have 2^32-1 commands per transaction"); + elog(ERROR, "You may only have 2^32-1 commands per transaction"); } CurrentTransactionStateData.scanCommandId = |