OSDN Git Service

Cost cleanup.
authorBruce Momjian <bruce@momjian.us>
Thu, 18 Dec 1997 12:30:44 +0000 (12:30 +0000)
committerBruce Momjian <bruce@momjian.us>
Thu, 18 Dec 1997 12:30:44 +0000 (12:30 +0000)
src/backend/optimizer/plan/createplan.c
src/backend/optimizer/plan/planmain.c

index 5412505..2c8900f 100644 (file)
@@ -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;
index a841b64..883b560 100644 (file)
@@ -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