upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-05-28 04:35:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Back-patch primary fix for planner recursion bug.

Browse source
This commit is contained in:
Tom Lane 2000-07-27 23:53:29 +00:00
parent daee6ca585
commit 91319022c4
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/backend/optimizer/plan/planner.c
View file

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.79 2000/04/12 17:15:22 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.79.2.1 2000/07/27 23:53:29 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -53,6 +53,22 @@ Plan *
planner(Query *parse)
{
Plan *result_plan;
Index save_PlannerQueryLevel;
List *save_PlannerInitPlan;
List *save_PlannerParamVar;
int save_PlannerPlanId;
/*
* The planner can be called recursively (an example is when
* eval_const_expressions tries to simplify an SQL function).
* So, global state variables must be saved and restored.
*
* (Perhaps these should be moved into the Query structure instead?)
*/
save_PlannerQueryLevel = PlannerQueryLevel;
save_PlannerInitPlan = PlannerInitPlan;
save_PlannerParamVar = PlannerParamVar;
save_PlannerPlanId = PlannerPlanId;
/* Initialize state for subselects */
PlannerQueryLevel = 1;
@ -81,6 +97,12 @@ planner(Query *parse)
/* final cleanup of the plan */
set_plan_references(result_plan);
/* restore state for outer planner, if any */
PlannerQueryLevel = save_PlannerQueryLevel;
PlannerInitPlan = save_PlannerInitPlan;
PlannerParamVar = save_PlannerParamVar;
PlannerPlanId = save_PlannerPlanId;
return result_plan;
}