bzr commit into mysql-6.0-bugteam branch (holyfoot:2797)

[Alexey Botchkov]

#At file:///home/hf/work/mysql_common/37066/

 2797 Alexey Botchkov	2008-12-11
      test commit
modified:
  sql/opt_range.cc

=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2008-12-10 09:02:11 +0000
+++ b/sql/opt_range.cc	2008-12-11 12:38:33 +0000
@@ -4820,13 +4820,14 @@ static TRP_RANGE *get_key_scans_params(P
       found_records= check_quick_select(param, idx, read_index_only, *key,
                                         update_tbl_stats, &mrr_flags,
                                         &buf_size, &cost);
-      found_read_time= cost.total_cost();
+      ;
       if ((found_records != HA_POS_ERROR) && param->is_ror_scan)
       {
         tree->n_ror_scans++;
         tree->ror_scans_map.set_bit(idx);
       }
-      if (read_time > found_read_time && found_records != HA_POS_ERROR)
+      if (found_records != HA_POS_ERROR &&
+          read_time > (found_read_time= cost.total_cost()))
       {
         read_time=    found_read_time;
         best_records= found_records;