Fix nasty little typo that prevented get_cheapest_path_for_joinkeys

from ever returning a path.  This put a bit of a crimp in the system's
ability to generate intelligent merge-join plans...

diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c
index 73a44f1c9005826938ca834d596ec6f190371c34..89412c2a8e75e9d0b79c06d30ae614ee890d16dc 100644 (file)
--- a/src/backend/optimizer/path/pathkeys.c
+++ b/src/backend/optimizer/path/pathkeys.c
@@ -240,10 +240,8 @@ get_cheapest_path_for_joinkeys(List *joinkeys,
                        pathorder_match(ordering, path->pathorder, &better_sort) &&
                        better_sort == 0)
                {
-                       if (matched_path)
-                               if (path->path_cost < matched_path->path_cost)
-                                       matched_path = path;
-                       else
+                       if (matched_path == NULL ||
+                               path->path_cost < matched_path->path_cost)
                                matched_path = path;
                }
        }