aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor/execProcnode.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1998-05-19 18:05:58 +0000
committerBruce Momjian <bruce@momjian.us>1998-05-19 18:05:58 +0000
commit07140ee024d666ccead4959816ac749e9ca1a0a8 (patch)
tree6b36d4e308732b67c6b66d2988b9758cfb5e302e /src/backend/executor/execProcnode.c
parentef567413d2f7a75c31b79a48c79ff628fec3e5fa (diff)
downloadpostgresql-07140ee024d666ccead4959816ac749e9ca1a0a8.tar.gz
postgresql-07140ee024d666ccead4959816ac749e9ca1a0a8.zip
Allow cancel from client of backend query. Change some int variables
to bool's.
Diffstat (limited to 'src/backend/executor/execProcnode.c')
-rw-r--r--src/backend/executor/execProcnode.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index f5842ecad32..16309ff6336 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.9 1998/02/26 04:31:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.10 1998/05/19 18:05:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -74,6 +74,8 @@
*/
#include "postgres.h"
+#include "miscadmin.h"
+#include "tcop/tcopprot.h"
#include "executor/executor.h"
#include "executor/nodeResult.h"
#include "executor/nodeAppend.h"
@@ -233,6 +235,10 @@ ExecProcNode(Plan *node, Plan *parent)
* deal with NULL nodes..
* ----------------
*/
+
+ if (QueryCancel)
+ CancelQuery();
+
if (node == NULL)
return NULL;