Fix problems with grouping/aggregation in queries that use

inheritance ... basically it was completely busted :-(

2 files changed, 8 insertions, 6 deletions

diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index edf4da525e6..96bf3ebfc11 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planmain.h,v 1.27 1999/05/26 12:56:36 momjian Exp $
+ * $Id: planmain.h,v 1.28 1999/06/06 17:38:09 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,7 +58,6 @@ extern void replace_tlist_with_subplan_refs(List *tlist,
 								Index subvarno,
 								List *subplanTargetList);
 extern bool set_agg_tlist_references(Agg *aggNode);
-extern void del_agg_tlist_references(List *tlist);
 extern void check_having_for_ungrouped_vars(Node *clause,
 								List *groupClause,
 								List *targetList);
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index 24e83d340de..c3b06101c67 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: prep.h,v 1.14 1999/02/13 23:21:52 momjian Exp $
+ * $Id: prep.h,v 1.15 1999/06/06 17:38:10 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,20 +17,23 @@
 #include <nodes/parsenodes.h>
 
 /*
- * prototypes for prepqual.h
+ * prototypes for prepqual.c
  */
 extern List *cnfify(Expr *qual, bool removeAndFlag);
 
 /*
- * prototypes for preptlist.h
+ * prototypes for preptlist.c
  */
 extern List *preprocess_targetlist(List *tlist, int command_type,
 					  Index result_relation, List *range_table);
 
+/*
+ * prototypes for prepunion.c
+ */
 extern List *find_all_inheritors(List *unexamined_relids,
 					List *examined_relids);
 extern int	first_inherit_rt_entry(List *rangetable);
 extern Append *plan_union_queries(Query *parse);
-extern Append *plan_inherit_queries(Query *parse, Index rt_index);
+extern Append *plan_inherit_queries(Query *parse, List *tlist, Index rt_index);
 
 #endif	 /* PREP_H */