77 *
88 *
99 * IDENTIFICATION
10- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.18 1998/01/15 18:59:53 momjian Exp $
10+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.19 1998/02/13 03:39:26 vadim Exp $
1111 *
1212 *-------------------------------------------------------------------------
1313 */
@@ -129,14 +129,14 @@ plan_union_queries(Query *parse)
129129List * hold_unionClause = parse -> unionClause ;
130130
131131parse -> unionClause = NIL ;/* prevent recursion */
132- union_plans = lcons (planner (parse ),NIL );
132+ union_plans = lcons (union_planner (parse ),NIL );
133133union_rts = lcons (parse -> rtable ,NIL );
134134
135135foreach (ulist ,hold_unionClause )
136136{
137137Query * union_query = lfirst (ulist );
138138
139- union_plans = lappend (union_plans ,planner (union_query ));
139+ union_plans = lappend (union_plans ,union_planner (union_query ));
140140union_rts = lappend (union_rts ,union_query -> rtable );
141141}
142142}
@@ -159,15 +159,15 @@ plan_union_queries(Query *parse)
159159 *Recursion, but UNION only.
160160 *The last one is a UNION, so it will not come here in recursion,
161161 */
162- union_plans = lcons (planner (parse ),NIL );
162+ union_plans = lcons (union_planner (parse ),NIL );
163163union_rts = lcons (parse -> rtable ,NIL );
164164
165165/* Append the remainging UNION ALLs */
166166foreach (ulist ,unionall_queries )
167167{
168168Query * unionall_query = lfirst (ulist );
169169
170- union_plans = lappend (union_plans ,planner (unionall_query ));
170+ union_plans = lappend (union_plans ,union_planner (unionall_query ));
171171union_rts = lappend (union_rts ,unionall_query -> rtable );
172172}
173173}
@@ -276,7 +276,7 @@ plan_inherit_query(List *relids,
276276relid ,
277277new_root );
278278
279- union_plans = lappend (union_plans ,planner (new_root ));
279+ union_plans = lappend (union_plans ,union_planner (new_root ));
280280union_rtentries = lappend (union_rtentries ,new_rt_entry );
281281}
282282