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:20 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2006-12-26 19:27:20 +0000
commit0fbfdf55f82cec91bd3cd1ba136e29f85f359a1a (patch)
tree0348841bb1789affefb2e029b27f3ec89de85a28 /src/backend/executor/nodeTidscan.c
parent8eb0f23a961e4c6e08191d8bf6c2a805d0c71eff (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 179aa887fdf..0796f191046 100644
--- a/src/backend/executor/nodeTidscan.c
+++ b/src/backend/executor/nodeTidscan.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.35 2003/09/26 01:17:01 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.35.2.1 2006/12/26 19:27:20 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -270,6 +270,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 =
@@ -385,6 +387,8 @@ ExecInitTidScan(TidScan *node, EState *estate)
*/
ExecAssignExprContext(estate, &tidstate->ss.ps);
+ tidstate->ss.ps.ps_TupFromTlist = false;
+
/*
* initialize child expressions
*/