diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-12-26 19:27:04 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-12-26 19:27:04 +0000 |
| commit | f1d8828e3ce8040e16794fb4d44255d8aef7df34 (patch) | |
| tree | 864b2b2da2da27703f26e006a13ab04b214ced9f /src/backend/executor/nodeIndexscan.c | |
| parent | 3dd05aba09b904147d3e7323c7412c2e2a754c4a (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/nodeIndexscan.c')
| -rw-r--r-- | src/backend/executor/nodeIndexscan.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index 009aba997f6..63a6073f779 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.104.2.1 2005/11/22 18:23:09 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.104.2.2 2006/12/26 19:27:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -183,6 +183,8 @@ ExecIndexReScan(IndexScanState *node, ExprContext *exprCtxt) numScanKeys = node->iss_NumScanKeys; scanrelid = ((IndexScan *) node->ss.ps.plan)->scan.scanrelid; + node->ss.ps.ps_TupFromTlist = false; + if (econtext) { /* @@ -384,6 +386,8 @@ ExecInitIndexScan(IndexScan *node, EState *estate) */ ExecAssignExprContext(estate, &indexstate->ss.ps); + indexstate->ss.ps.ps_TupFromTlist = false; + /* * initialize child expressions * |