diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-01-07 21:07:04 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-01-07 21:07:04 +0000 |
| commit | 679d39b9c8fbe8f5613879b11431d8152d85ec54 (patch) | |
| tree | 9d2a87706e8585160143a1d647bb7558818ccc3d /src/backend/storage/ipc | |
| parent | e6c6146eb8129f1ea1e1f68ef739c13824357225 (diff) | |
Goodbye ABORT. Hello ERROR for all errors.
Diffstat (limited to 'src/backend/storage/ipc')
| -rw-r--r-- | src/backend/storage/ipc/ipc.c | 4 | ||||
| -rw-r--r-- | src/backend/storage/ipc/shmem.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index 1d08318007c..49843807a0e 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.17 1998/01/05 03:33:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.18 1998/01/07 21:05:03 momjian Exp $ * * NOTES * @@ -89,7 +89,7 @@ PrivateMemoryCreate(IpcMemoryKey memKey, IpcPrivateMem[memid].id = memid; IpcPrivateMem[memid].memptr = malloc(size); if (IpcPrivateMem[memid].memptr == NULL) - elog(ABORT, "PrivateMemoryCreate: not enough memory to malloc"); + elog(ERROR, "PrivateMemoryCreate: not enough memory to malloc"); MemSet(IpcPrivateMem[memid].memptr, 0, size); /* XXX PURIFY */ return (memid++); diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index dca616d5775..c477b7d401d 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.15 1998/01/05 03:33:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.16 1998/01/07 21:05:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -418,7 +418,7 @@ ShmemPIDLookup(int pid, SHMEM_OFFSET *locationPtr) { SpinRelease(BindingLock); - elog(ABORT, "ShmemInitPID: BindingTable corrupted"); + elog(ERROR, "ShmemInitPID: BindingTable corrupted"); return (FALSE); } @@ -469,7 +469,7 @@ ShmemPIDDestroy(int pid) if (!result) { - elog(ABORT, "ShmemPIDDestroy: PID table corrupted"); + elog(ERROR, "ShmemPIDDestroy: PID table corrupted"); return (INVALID_OFFSET); } @@ -555,7 +555,7 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr) SpinRelease(BindingLock); - elog(ABORT, "ShmemInitStruct: Binding Table corrupted"); + elog(ERROR, "ShmemInitStruct: Binding Table corrupted"); return (NULL); } @@ -640,6 +640,6 @@ TransactionIdIsInProgress(TransactionId xid) } SpinRelease(BindingLock); - elog(ABORT, "TransactionIdIsInProgress: BindingTable corrupted"); + elog(ERROR, "TransactionIdIsInProgress: BindingTable corrupted"); return (false); } |