aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2006-03-10 01:51:34 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2006-03-10 01:51:34 +0000
commit98ab0c96dd8b039d4a2e415d0c3f7def6ab8c427 (patch)
tree353892598490c98c837f1fef301b284678e85420 /src
parent0a5c6fadf4e98e069263927a6ffaea9758962dbd (diff)
downloadpostgresql-98ab0c96dd8b039d4a2e415d0c3f7def6ab8c427.tar.gz
postgresql-98ab0c96dd8b039d4a2e415d0c3f7def6ab8c427.zip
Add a CHECK_FOR_INTERRUPTS() to the loop in ExecMakeTableFunctionResult.
Otherwise you can't cancel queries like select ... from generate_series(1,1000000).
Diffstat (limited to 'src')
-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 796c65d1143..c10a67eaba3 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.183.2.2 2005/12/14 16:28:48 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.183.2.3 2006/03/10 01:51:34 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1294,6 +1294,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