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/utils/error/elog.c | |
| parent | e6c6146eb8129f1ea1e1f68ef739c13824357225 (diff) | |
| download | postgresql-679d39b9c8fbe8f5613879b11431d8152d85ec54.tar.gz postgresql-679d39b9c8fbe8f5613879b11431d8152d85ec54.zip | |
Goodbye ABORT. Hello ERROR for all errors.
Diffstat (limited to 'src/backend/utils/error/elog.c')
| -rw-r--r-- | src/backend/utils/error/elog.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 1b3face7b93..566125f6e45 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.23 1998/01/05 04:10:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.24 1998/01/07 21:06:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -90,9 +90,6 @@ elog(int lev, const char *fmt,...) case ERROR: cp = "ERROR: "; break; - case ABORT: - cp = "ABORT: "; - break; default: sprintf(line, "FATAL %d: ", lev); cp = line; @@ -173,12 +170,12 @@ elog(int lev, const char *fmt,...) } #endif /* !PG_STANDALONE */ - if (lev == ERROR || lev == ABORT) + if (lev == ERROR) { - extern int InErrorOrAbort; + extern int InError; ProcReleaseSpins(NULL); /* get rid of spinlocks we hold */ - if (!InErrorOrAbort) + if (!InError) { kill(getpid(), 1); /* abort to traffic cop */ pause(); |