From 7028c13557067ec2cad0febcc0671551fce3190d Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 23 Oct 2008 15:29:23 +0000 Subject: Fix an oversight in two different recent patches: nodes that support SRFs in their targetlists had better reset ps_TupFromTlist during ReScan calls. There's no need to back-patch here since nodeAgg and nodeGroup didn't even pretend to support SRFs in prior releases. --- src/backend/executor/nodeCtescan.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/backend/executor/nodeCtescan.c') diff --git a/src/backend/executor/nodeCtescan.c b/src/backend/executor/nodeCtescan.c index b4ae27df38..b13736b08e 100644 --- a/src/backend/executor/nodeCtescan.c +++ b/src/backend/executor/nodeCtescan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeCtescan.c,v 1.1 2008/10/04 21:56:53 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeCtescan.c,v 1.2 2008/10/23 15:29:23 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -303,11 +303,10 @@ ExecEndCteScan(CteScanState *node) void ExecCteScanReScan(CteScanState *node, ExprContext *exprCtxt) { - Tuplestorestate *tuplestorestate; - - tuplestorestate = node->leader->cte_table; + Tuplestorestate *tuplestorestate = node->leader->cte_table; ExecClearTuple(node->ss.ps.ps_ResultTupleSlot); + node->ss.ps.ps_TupFromTlist = false; if (node->leader == node) { -- cgit v1.2.1