diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-05-28 18:19:09 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-05-28 18:19:09 +0000 |
| commit | 4df52b28f04669a23d7748af0a6d21b33fdda5df (patch) | |
| tree | a71069ad1c7922304bfee395e5fe57a35ce135fa /src/backend/bootstrap/bootstrap.c | |
| parent | aae078198dd4b9cbb3590262dcb65d0b735c80d7 (diff) | |
| download | postgresql-4df52b28f04669a23d7748af0a6d21b33fdda5df.tar.gz postgresql-4df52b28f04669a23d7748af0a6d21b33fdda5df.zip | |
Fix things so that an error occuring during standalone-backend processing
in initdb will result in exit(1), allowing the initdb script to realize
that there's something wrong.
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
| -rw-r--r-- | src/backend/bootstrap/bootstrap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 8539537f519..13ca093f746 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.159 2003/05/28 16:03:55 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.160 2003/05/28 18:19:09 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -838,7 +838,7 @@ BootstrapAlreadySeen(Oid id) * ---------------- */ static void -cleanup() +cleanup(void) { static int beenhere = 0; @@ -846,13 +846,13 @@ cleanup() beenhere = 1; else { - elog(FATAL, "Memory manager fault: cleanup called twice.\n"); + elog(FATAL, "Memory manager fault: cleanup called twice"); proc_exit(1); } if (boot_reldesc != NULL) closerel(NULL); CommitTransactionCommand(); - proc_exit(Warnings); + proc_exit(Warnings ? 1 : 0); } /* ---------------- |