diff options
Diffstat (limited to 'src/backend/optimizer/path/joinpath.c')
| -rw-r--r-- | src/backend/optimizer/path/joinpath.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c index 76b4fd81e8f..c0086fe559e 100644 --- a/src/backend/optimizer/path/joinpath.c +++ b/src/backend/optimizer/path/joinpath.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.16 1999/02/09 03:51:19 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.17 1999/02/10 03:52:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -341,19 +341,19 @@ match_unsorted_outer(RelOptInfo * joinrel, if (clauses) { - List *keys = xmergeinfo->jmethod.jmkeys; + List *jmkeys = xmergeinfo->jmethod.jmkeys; List *clauses = xmergeinfo->jmethod.clauses; - matchedJoinKeys = match_pathkeys_joinkeys(outerpath->keys, - keys, + matchedJoinKeys = match_pathkeys_joinkeys(outerpath->pathkeys, + jmkeys, clauses, OUTER, &matchedJoinClauses); - merge_pathkeys = new_join_pathkeys(outerpath->keys, + merge_pathkeys = new_join_pathkeys(outerpath->pathkeys, joinrel->targetlist, clauses); } else - merge_pathkeys = outerpath->keys; + merge_pathkeys = outerpath->pathkeys; if (best_innerjoin && path_is_cheaper(best_innerjoin, cheapest_inner)) @@ -415,7 +415,7 @@ match_unsorted_outer(RelOptInfo * joinrel, matchedJoinClauses, NIL, varkeys), - paths); + paths); } else temp_node = paths; @@ -484,11 +484,11 @@ match_unsorted_inner(RelOptInfo * joinrel, if (clauses) { - List *keys = xmergeinfo->jmethod.jmkeys; + List *jmkeys = xmergeinfo->jmethod.jmkeys; List *cls = xmergeinfo->jmethod.clauses; - matchedJoinKeys = match_pathkeys_joinkeys(innerpath->keys, - keys, + matchedJoinKeys = match_pathkeys_joinkeys(innerpath->pathkeys, + jmkeys, cls, INNER, &matchedJoinClauses); |