Commita01b085

committed

Cleanup of UNION ALL fix. Manual page updates.

1 parent4ce24c8 commita01b085Copy full SHA for a01b085

File tree

+277

-259

lines changed

+277

-259

lines changed

Lines changed: 5 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.17 1997/12/27 06:41:07 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.18 1997/12/29 01:12:45 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -76,26 +76,22 @@ planner(Query *parse)`
`76`	`76`	`Planresult_plan= (Plan)NULL;`
`77`	`77`
`78`	`78`	`List*primary_qual;`
`79`		`-intrt_index;`
	`79`	`+Indexrt_index;`
`80`	`80`
`81`	`81`
`82`	`82`	`if (parse->unionClause)`
`83`	`83`	`{`
`84`		`-result_plan= (Plan)plan_union_queries(0,/ none */`
`85`		`-parse,`
`86`		`-UNION_FLAG);`
	`84`	`+result_plan= (Plan*)plan_union_queries(parse);`
`87`	`85`	`/* XXX do we need to do this? bjm 12/19/97 */`
`88`	`86`	`tlist=preprocess_targetlist(tlist,`
`89`	`87`	`parse->commandType,`
`90`	`88`	`parse->resultRelation,`
`91`	`89`	`parse->rtable);`
`92`	`90`	`}`
`93`	`91`	`elseif ((rt_index=`
`94`		`-first_matching_rt_entry(rangetable,INHERITS_FLAG))!=-1)`
	`92`	`+first_inherit_rt_entry(rangetable))!=-1)`
`95`	`93`	`{`
`96`		`-result_plan= (Plan*)plan_union_queries((Index)rt_index,`
`97`		`-parse,`
`98`		`-INHERITS_FLAG);`
	`94`	`+result_plan= (Plan*)plan_inherit_queries(parse,rt_index);`
`99`	`95`	`/* XXX do we need to do this? bjm 12/19/97 */`
`100`	`96`	`tlist=preprocess_targetlist(tlist,`
`101`	`97`	`parse->commandType,`

Comments

(0)