From 4df52b28f04669a23d7748af0a6d21b33fdda5df Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 28 May 2003 18:19:09 +0000
Subject: 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.

---
 src/backend/bootstrap/bootstrap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/backend/bootstrap/bootstrap.c')

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);
 }
 
 /* ----------------
-- 
cgit v1.2.3