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/bootstrap | |
| parent | e6c6146eb8129f1ea1e1f68ef739c13824357225 (diff) | |
| download | postgresql-679d39b9c8fbe8f5613879b11431d8152d85ec54.tar.gz postgresql-679d39b9c8fbe8f5613879b11431d8152d85ec54.zip | |
Goodbye ABORT. Hello ERROR for all errors.
Diffstat (limited to 'src/backend/bootstrap')
| -rw-r--r-- | src/backend/bootstrap/bootparse.y | 6 | ||||
| -rw-r--r-- | src/backend/bootstrap/bootstrap.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y index 2c86b7826ed..4958f2e554b 100644 --- a/src/backend/bootstrap/bootparse.y +++ b/src/backend/bootstrap/bootparse.y @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.12 1998/01/06 18:51:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.13 1998/01/07 21:02:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -203,10 +203,10 @@ Boot_InsertStmt: LPAREN boot_tuplelist RPAREN { if (num_tuples_read != numattr) - elog(ABORT,"incorrect number of values for tuple"); + elog(ERROR,"incorrect number of values for tuple"); if (reldesc == (Relation)NULL) { - elog(ABORT,"must OPEN RELATION before INSERT\n"); + elog(ERROR,"must OPEN RELATION before INSERT\n"); err_out(); } if (DebugMode) diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index b7592cfc660..09179f09771 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -7,7 +7,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.31 1998/01/05 03:30:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.32 1998/01/07 21:02:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -572,18 +572,18 @@ closerel(char *name) if (reldesc) { if (namestrcmp(RelationGetRelationName(reldesc), name) != 0) - elog(ABORT, "closerel: close of '%s' when '%s' was expected", + elog(ERROR, "closerel: close of '%s' when '%s' was expected", name, relname ? relname : "(null)"); } else - elog(ABORT, "closerel: close of '%s' before any relation was opened", + elog(ERROR, "closerel: close of '%s' before any relation was opened", name); } if (reldesc == NULL) { - elog(ABORT, "Warning: no opened relation to close.\n"); + elog(ERROR, "Warning: no opened relation to close.\n"); } else { @@ -879,7 +879,7 @@ gettype(char *type) heap_close(rdesc); return (gettype(type)); } - elog(ABORT, "Error: unknown type '%s'.\n", type); + elog(ERROR, "Error: unknown type '%s'.\n", type); err_out(); /* not reached, here to make compiler happy */ return 0; |