aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/error/elog.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils/error/elog.c')
-rw-r--r--src/backend/utils/error/elog.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index c70958a9de1..d2f9117059c 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.142 2004/06/24 21:03:13 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.143 2004/07/28 22:05:46 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -72,8 +72,6 @@ PGErrorVerbosity Log_error_verbosity = PGERROR_VERBOSE;
char *Log_line_prefix = NULL; /* format for extra log line info */
unsigned int Log_destination = LOG_DESTINATION_STDERR;
-bool in_fatal_exit = false;
-
#ifdef HAVE_SYSLOG
char *Syslog_facility; /* openlog() parameters */
char *Syslog_ident;
@@ -444,16 +442,7 @@ errfinish(int dummy,...)
*/
fflush(stdout);
fflush(stderr);
-
- if (in_fatal_exit)
- ereport(PANIC, (errmsg("fatal error during fatal exit, giving up")));
-
- /* not safe to longjump */
- if (!Warn_restart_ready || proc_exit_inprogress)
- proc_exit(proc_exit_inprogress || !IsUnderPostmaster);
-
- /* We will exit the backend by simulating a client EOF */
- in_fatal_exit = true;
+ proc_exit(proc_exit_inprogress || !IsUnderPostmaster);
}
/*