diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2008-10-23 15:29:23 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2008-10-23 15:29:23 +0000 |
| commit | 7028c13557067ec2cad0febcc0671551fce3190d (patch) | |
| tree | 0eebfaaf03df4fb0225e8af1478058d6eb4304d5 /src/backend/executor/nodeGroup.c | |
| parent | d5789018c7de551bcce45b6924dda588f9858162 (diff) | |
| download | postgresql-7028c13557067ec2cad0febcc0671551fce3190d.tar.gz postgresql-7028c13557067ec2cad0febcc0671551fce3190d.zip | |
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.
Diffstat (limited to 'src/backend/executor/nodeGroup.c')
| -rw-r--r-- | src/backend/executor/nodeGroup.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c index 31566f1fb52..63d9c96cdf8 100644 --- a/src/backend/executor/nodeGroup.c +++ b/src/backend/executor/nodeGroup.c @@ -15,7 +15,7 @@ * locate group boundaries. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeGroup.c,v 1.71 2008/09/08 00:22:56 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeGroup.c,v 1.72 2008/10/23 15:29:23 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -247,6 +247,8 @@ ExecInitGroup(Group *node, EState *estate, int eflags) ExecAssignResultTypeFromTL(&grpstate->ss.ps); ExecAssignProjectionInfo(&grpstate->ss.ps, NULL); + grpstate->ss.ps.ps_TupFromTlist = false; + /* * Precompute fmgr lookup data for inner loop */ @@ -286,6 +288,7 @@ void ExecReScanGroup(GroupState *node, ExprContext *exprCtxt) { node->grp_done = FALSE; + node->ss.ps.ps_TupFromTlist = false; /* must clear first tuple */ ExecClearTuple(node->ss.ss_ScanTupleSlot); |