summaryrefslogtreecommitdiff
path: root/src/backend/executor/nodeTidscan.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2006-12-26 19:27:04 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2006-12-26 19:27:04 +0000
commitf1d8828e3ce8040e16794fb4d44255d8aef7df34 (patch)
tree864b2b2da2da27703f26e006a13ab04b214ced9f /src/backend/executor/nodeTidscan.c
parent3dd05aba09b904147d3e7323c7412c2e2a754c4a (diff)
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/nodeTidscan.c')
-rw-r--r--src/backend/executor/nodeTidscan.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c
index c8708f58311..43aa23917a4 100644
--- a/src/backend/executor/nodeTidscan.c
+++ b/src/backend/executor/nodeTidscan.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/executor/nodeTidscan.c,v 1.43 2005/10/15 02:49:17 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/executor/nodeTidscan.c,v 1.43.2.1 2006/12/26 19:27:04 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -275,6 +275,8 @@ ExecTidReScan(TidScanState *node, ExprContext *exprCtxt)
estate = node->ss.ps.state;
scanrelid = ((TidScan *) node->ss.ps.plan)->scan.scanrelid;
+ node->ss.ps.ps_TupFromTlist = false;
+
/* If we are being passed an outer tuple, save it for runtime key calc */
if (exprCtxt != NULL)
node->ss.ps.ps_ExprContext->ecxt_outertuple =
@@ -389,6 +391,8 @@ ExecInitTidScan(TidScan *node, EState *estate)
*/
ExecAssignExprContext(estate, &tidstate->ss.ps);
+ tidstate->ss.ps.ps_TupFromTlist = false;
+
/*
* initialize child expressions
*/