diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-12-26 19:27:10 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-12-26 19:27:10 +0000 |
| commit | cbca48aa240190f3eacfcddaee09b5f16ebf46bf (patch) | |
| tree | 892292f217dfcd9336f238eb675bbab5568cf46d /src/backend/executor/nodeTidscan.c | |
| parent | b328083249dbc6269a2bea5edae4ee247a830310 (diff) | |
| download | postgresql-cbca48aa240190f3eacfcddaee09b5f16ebf46bf.tar.gz postgresql-cbca48aa240190f3eacfcddaee09b5f16ebf46bf.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/nodeTidscan.c')
| -rw-r--r-- | src/backend/executor/nodeTidscan.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c index a1eb4351dbb..1cc361cfe5a 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.41 2004/12/31 21:59:45 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeTidscan.c,v 1.41.4.1 2006/12/26 19:27:10 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -276,6 +276,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 = @@ -391,6 +393,8 @@ ExecInitTidScan(TidScan *node, EState *estate) */ ExecAssignExprContext(estate, &tidstate->ss.ps); + tidstate->ss.ps.ps_TupFromTlist = false; + /* * initialize child expressions */ |