From 4469eb63a3796243978ea1fe674dec73bd774a42 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 18 Dec 1997 12:30:44 +0000 Subject: [PATCH] Cost cleanup. --- src/backend/optimizer/plan/createplan.c | 4 ++-- src/backend/optimizer/plan/planmain.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 54125052fa..2c8900f64c 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.18 1997/12/18 12:20:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.19 1997/12/18 12:30:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1114,7 +1114,7 @@ make_agg(List *tlist, int nagg, Aggreg **aggs, Plan *lefttree) node->plan.state = (EState *) NULL; node->plan.qual = NULL; node->plan.targetlist = tlist; - node->plan.lefttree = (Plan *) NULL; + node->plan.lefttree = lefttree; node->plan.righttree = (Plan *) NULL; node->numAgg = nagg; node->aggs = aggs; diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c index a841b64063..883b5601b6 100644 --- a/src/backend/optimizer/plan/planmain.c +++ b/src/backend/optimizer/plan/planmain.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.9 1997/12/18 03:03:38 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.10 1997/12/18 12:30:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -200,8 +200,7 @@ query_planner(Query *root, */ if (root->qry_aggs) { - aggplan = make_agg(tlist, root->qry_numAgg, root->qry_aggs); - aggplan->plan.lefttree = subplan; + aggplan = make_agg(tlist, root->qry_numAgg, root->qry_aggs, subplan); /* * set the varno/attno entries to the appropriate references to