diff options
Diffstat (limited to 'src/backend/optimizer/path/joinrels.c')
-rw-r--r-- | src/backend/optimizer/path/joinrels.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c index 4ca9cc157ee..c30d93f4f24 100644 --- a/src/backend/optimizer/path/joinrels.c +++ b/src/backend/optimizer/path/joinrels.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.11 1998/07/18 04:22:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.12 1998/08/04 16:44:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -360,8 +360,8 @@ new_joininfo_list(List *joininfo_list, List *join_relids) joininfo->otherrels; other_joininfo->jinfoclauseinfo = joininfo->jinfoclauseinfo; - other_joininfo->mergesortable = - joininfo->mergesortable; + other_joininfo->mergejoinable = + joininfo->mergejoinable; other_joininfo->hashjoinable = joininfo->hashjoinable; other_joininfo->inactive = false; @@ -415,7 +415,7 @@ add_new_joininfos(Query *root, List *joinrels, List *outerrels) JInfo *joininfo = (JInfo *) lfirst(xjoininfo); List *other_rels = joininfo->otherrels; List *clause_info = joininfo->jinfoclauseinfo; - bool mergesortable = joininfo->mergesortable; + bool mergejoinable = joininfo->mergejoinable; bool hashjoinable = joininfo->hashjoinable; foreach(xrelid, other_rels) @@ -428,7 +428,7 @@ add_new_joininfos(Query *root, List *joinrels, List *outerrels) new_joininfo->otherrels = joinrel->relids; new_joininfo->jinfoclauseinfo = clause_info; - new_joininfo->mergesortable = mergesortable; + new_joininfo->mergejoinable = mergejoinable; new_joininfo->hashjoinable = hashjoinable; new_joininfo->inactive = false; rel->joininfo = @@ -457,7 +457,7 @@ add_new_joininfos(Query *root, List *joinrels, List *outerrels) new_joininfo->otherrels = new_relids; new_joininfo->jinfoclauseinfo = clause_info; - new_joininfo->mergesortable = mergesortable; + new_joininfo->mergejoinable = mergejoinable; new_joininfo->hashjoinable = hashjoinable; new_joininfo->inactive = false; joinrel->joininfo = |