aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2006-03-10 01:51:23 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2006-03-10 01:51:23 +0000
commitbbfa1c39a1463693e9a3d704439034e69f11d823 (patch)
treebc32a5f538349745f58d4f1c33861fd83ae62fc0
parent59317375712073d3476f0f1c952a291ee9dfafc3 (diff)
downloadpostgresql-bbfa1c39a1463693e9a3d704439034e69f11d823.tar.gz
postgresql-bbfa1c39a1463693e9a3d704439034e69f11d823.zip
Add a CHECK_FOR_INTERRUPTS() to the loop in ExecMakeTableFunctionResult.
Otherwise you can't cancel queries like select ... from generate_series(1,1000000).
-rw-r--r--src/backend/executor/execQual.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 6283a739536..fcc7d4b683c 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.188 2006/03/05 15:58:26 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.189 2006/03/10 01:51:23 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1280,6 +1280,8 @@ ExecMakeTableFunctionResult(ExprState *funcexpr,
Datum result;
HeapTuple tuple;
+ CHECK_FOR_INTERRUPTS();
+
/*
* reset per-tuple memory context before each call of the function or
* expression. This cleans up any local memory the function may leak