From d3db2bd80c8ee9a0cb2679ba341892e620a2676e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 26 Dec 2006 19:27:26 +0000 Subject: 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. --- src/backend/executor/nodeFunctionscan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/backend/executor/nodeFunctionscan.c') diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c index cf8d74a06f2..a5323af6922 100644 --- a/src/backend/executor/nodeFunctionscan.c +++ b/src/backend/executor/nodeFunctionscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeFunctionscan.c,v 1.12 2002/09/04 20:31:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeFunctionscan.c,v 1.12.2.1 2006/12/26 19:27:26 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -361,6 +361,7 @@ ExecFunctionReScan(FunctionScan *node, ExprContext *exprCtxt, Plan *parent) scanstate = (FunctionScanState *) node->scan.scanstate; ExecClearTuple(scanstate->csstate.cstate.cs_ResultTupleSlot); + scanstate->csstate.cstate.cs_TupFromTlist = false; /* * If we haven't materialized yet, just return. -- cgit v1.2.3