diff options
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 40a08e5220d..d9340f2544e 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.10 1997/12/17 18:21:37 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.11 1998/01/05 03:30:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -203,10 +203,10 @@ InsertStmt: LPAREN tuplelist RPAREN { if (num_tuples_read != numattr) - elog(WARN,"incorrect number of values for tuple"); + elog(ABORT,"incorrect number of values for tuple"); if (reldesc == (Relation)NULL) { - elog(WARN,"must OPEN RELATION before INSERT\n"); + elog(ABORT,"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 e620b3fdbac..b7592cfc660 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.30 1998/01/01 05:40:28 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.31 1998/01/05 03:30:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -572,18 +572,18 @@ closerel(char *name) if (reldesc) { if (namestrcmp(RelationGetRelationName(reldesc), name) != 0) - elog(WARN, "closerel: close of '%s' when '%s' was expected", + elog(ABORT, "closerel: close of '%s' when '%s' was expected", name, relname ? relname : "(null)"); } else - elog(WARN, "closerel: close of '%s' before any relation was opened", + elog(ABORT, "closerel: close of '%s' before any relation was opened", name); } if (reldesc == NULL) { - elog(WARN, "Warning: no opened relation to close.\n"); + elog(ABORT, "Warning: no opened relation to close.\n"); } else { @@ -879,7 +879,7 @@ gettype(char *type) heap_close(rdesc); return (gettype(type)); } - elog(WARN, "Error: unknown type '%s'.\n", type); + elog(ABORT, "Error: unknown type '%s'.\n", type); err_out(); /* not reached, here to make compiler happy */ return 0; |