From 65b362fae15aba68d5cd7d4204b8224c3e1c2c07 Mon Sep 17 00:00:00 2001
From: "Vadim B. Mikheev" <vadim4o@yahoo.com>
Date: Sun, 3 Dec 2000 10:27:29 +0000
Subject: Disable elog(ERROR|FATAL) in signal handlers in critical sections of
 code.

---
 src/backend/utils/error/elog.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/backend/utils/error/elog.c')

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index e6c19b246e..3ce9434d68 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.70 2000/12/01 19:52:04 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.71 2000/12/03 10:27:28 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,7 +33,6 @@
 #include "commands/copy.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
-#include "miscadmin.h"
 #include "storage/proc.h"
 #include "tcop/tcopprot.h"
 #include "utils/memutils.h"
@@ -159,6 +158,8 @@ elog(int lev, const char *fmt, ...)
 		/* this is probably redundant... */
 		if (IsInitProcessingMode())
 			lev = FATAL;
+		if (StopIfError)
+			lev = STOP;
 	}
 
 	/* choose message prefix and indent level */
-- 
cgit v1.2.1