aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor/nodeIndexscan.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2006-12-26 19:26:56 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2006-12-26 19:26:56 +0000
commit85a373b1f087ca15a7f1a84b5f9541400d02ad00 (patch)
tree4f8a7aed02d3e07e3761052c46276af9143fa425 /src/backend/executor/nodeIndexscan.c
parentb85a4cda83bc7a19031730465d358e415935f05b (diff)
downloadpostgresql-85a373b1f087ca15a7f1a84b5f9541400d02ad00.tar.gz
postgresql-85a373b1f087ca15a7f1a84b5f9541400d02ad00.zip
Repair bug #2839: the various ExecReScan functions need to reset
ps_TupFromTlist in plan nodes that make use of it. This was being done correctly in join nodes and Result nodes but not in any relation-scan nodes. Bug would lead to bogus results if a set-returning function appeared in the targetlist of a subquery that could be rescanned after partial execution, for example a subquery within EXISTS(). Bug has been around forever :-( ... surprising it wasn't reported before.
Diffstat (limited to 'src/backend/executor/nodeIndexscan.c')
-rw-r--r--src/backend/executor/nodeIndexscan.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 9773f2341ec..10ea65c5ec7 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.117 2006/10/04 00:29:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.117.2.1 2006/12/26 19:26:56 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -168,6 +168,8 @@ ExecIndexReScan(IndexScanState *node, ExprContext *exprCtxt)
econtext = node->iss_RuntimeContext; /* context for runtime keys */
scanrelid = ((IndexScan *) node->ss.ps.plan)->scan.scanrelid;
+ node->ss.ps.ps_TupFromTlist = false;
+
if (econtext)
{
/*
@@ -476,6 +478,8 @@ ExecInitIndexScan(IndexScan *node, EState *estate, int eflags)
*/
ExecAssignExprContext(estate, &indexstate->ss.ps);
+ indexstate->ss.ps.ps_TupFromTlist = false;
+
/*
* initialize child expressions
*