Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/usr/home/bar/mysql-5.0.fresh

1 files changed, 6 insertions, 2 deletions

diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 66d9da10334..0418225965a 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -7030,8 +7030,12 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree)
                        cur_group_key_parts, tree, cur_index_tree,
                        cur_quick_prefix_records, have_min, have_max,
                        &cur_read_cost, &cur_records);
-
-    if (cur_read_cost < best_read_cost)
+    /*
+      If cur_read_cost is lower than best_read_cost use cur_index.
+      Do not compare doubles directly because they may have different
+      representations (64 vs. 80 bits).
+    */
+    if (cur_read_cost < best_read_cost - (DBL_EPSILON * cur_read_cost))
     {
       index_info= cur_index_info;
       index= cur_index;