diff options
Diffstat (limited to 'src/backend/optimizer/util')
| -rw-r--r-- | src/backend/optimizer/util/joininfo.c | 4 | ||||
| -rw-r--r-- | src/backend/optimizer/util/pathnode.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c index 9f2e574fe63..2aec33231db 100644 --- a/src/backend/optimizer/util/joininfo.c +++ b/src/backend/optimizer/util/joininfo.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.8 1998/07/18 04:22:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.9 1998/08/04 16:44:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,7 +72,7 @@ find_joininfo_node(RelOptInfo *this_rel, List *join_relids) joininfo = makeNode(JInfo); joininfo->otherrels = join_relids; joininfo->jinfoclauseinfo = NIL; - joininfo->mergesortable = false; + joininfo->mergejoinable = false; joininfo->hashjoinable = false; joininfo->inactive = false; this_rel->joininfo = lcons(joininfo, this_rel->joininfo); diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index 7b48b91bd5c..6b62ac79d6d 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.9 1998/07/18 04:22:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.10 1998/08/04 16:44:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -462,8 +462,8 @@ create_nestloop_path(RelOptInfo *joinrel, } /* - * create_mergesort_path-- - * Creates a pathnode corresponding to a mergesort join between + * create_mergejoin_path-- + * Creates a pathnode corresponding to a mergejoin join between * two relations * * 'joinrel' is the join relation @@ -481,7 +481,7 @@ create_nestloop_path(RelOptInfo *joinrel, * */ MergePath * -create_mergesort_path(RelOptInfo *joinrel, +create_mergejoin_path(RelOptInfo *joinrel, int outersize, int innersize, int outerwidth, @@ -509,7 +509,7 @@ create_mergesort_path(RelOptInfo *joinrel, pathnode->outersortkeys = outersortkeys; pathnode->innersortkeys = innersortkeys; pathnode->jpath.path.path_cost = - cost_mergesort(outer_path->path_cost, + cost_mergejoin(outer_path->path_cost, inner_path->path_cost, outersortkeys, innersortkeys, |