diff options
Diffstat (limited to 'src/backend/optimizer/plan')
| -rw-r--r-- | src/backend/optimizer/plan/createplan.c | 6 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/initsplan.c | 5 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/planmain.c | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 69c0a3f65be..97a021a2dd2 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.83 2000/02/03 06:12:18 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.84 2000/02/07 04:41:00 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -147,7 +147,7 @@ create_scan_node(Query *root, Path *best_path, List *tlist) * Extract the relevant restriction clauses from the parent relation; * the executor must apply all these restrictions during the scan. */ - scan_clauses = get_actual_clauses(best_path->parent->restrictinfo); + scan_clauses = get_actual_clauses(best_path->parent->baserestrictinfo); switch (best_path->pathtype) { @@ -203,7 +203,7 @@ create_join_node(Query *root, JoinPath *best_path, List *tlist) inner_node = create_plan(root, best_path->innerjoinpath); inner_tlist = inner_node->targetlist; - clauses = get_actual_clauses(best_path->path.parent->restrictinfo); + clauses = get_actual_clauses(best_path->joinrestrictinfo); switch (best_path->path.pathtype) { diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index 7ae5f3caf9b..b94cc3e4b42 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.43 2000/01/26 05:56:37 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.44 2000/02/07 04:41:00 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -179,7 +179,8 @@ add_restrict_and_join_to_rel(Query *root, Node *clause) */ RelOptInfo *rel = get_base_rel(root, lfirsti(relids)); - rel->restrictinfo = lcons(restrictinfo, rel->restrictinfo); + rel->baserestrictinfo = lcons(restrictinfo, + rel->baserestrictinfo); } else { diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c index 4c7225b0d99..a414a910fef 100644 --- a/src/backend/optimizer/plan/planmain.c +++ b/src/backend/optimizer/plan/planmain.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.50 2000/01/26 05:56:37 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.51 2000/02/07 04:41:00 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -219,7 +219,7 @@ subplanner(Query *root, add_restrict_and_join_to_rels(root, qual); add_missing_rels_to_query(root); - final_rel = make_one_rel(root, root->base_rel_list); + final_rel = make_one_rel(root); if (! final_rel) { |