From 36839c192706f5abd75bdcb02b6a7cace14ce108 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 14 Jan 2001 05:08:17 +0000
Subject: Restructure backend SIGINT/SIGTERM handling so that 'die' interrupts
 are treated more like 'cancel' interrupts: the signal handler sets a flag
 that is examined at well-defined spots, rather than trying to cope with an
 interrupt that might happen anywhere.  See pghackers discussion of 1/12/01.

---
 src/backend/executor/execProcnode.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/backend/executor/execProcnode.c')

diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index d7db099653d..6cc2a1aed97 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.22 2000/10/26 21:35:15 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.23 2001/01/14 05:08:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -248,14 +248,12 @@ ExecProcNode(Plan *node, Plan *parent)
 {
 	TupleTableSlot *result;
 
+	CHECK_FOR_INTERRUPTS();
+
 	/* ----------------
 	 *	deal with NULL nodes..
 	 * ----------------
 	 */
-
-	if (QueryCancel)
-		CancelQuery();
-
 	if (node == NULL)
 		return NULL;
 
-- 
cgit v1.2.3