diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2001-01-14 05:08:17 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2001-01-14 05:08:17 +0000 |
| commit | 36839c192706f5abd75bdcb02b6a7cace14ce108 (patch) | |
| tree | 3022631b1208e1227684db86c12cbba7da15f611 /src/backend/executor/execProcnode.c | |
| parent | 027f144e390afa6f189270e8c2a2a56c0a88f646 (diff) | |
| download | postgresql-36839c192706f5abd75bdcb02b6a7cace14ce108.tar.gz postgresql-36839c192706f5abd75bdcb02b6a7cace14ce108.zip | |
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.
Diffstat (limited to 'src/backend/executor/execProcnode.c')
| -rw-r--r-- | src/backend/executor/execProcnode.c | 8 |
1 files changed, 3 insertions, 5 deletions
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; |