Incorrect cost computation in best_access_path: record_count *= TIME_FOR_COMPARE

diff --git a/sql/sql_select.cc b/sql/sql_select.cc

index 86f51917f50..dcf0281f60d 100644

--- a/sql/sql_select.cc

+++ b/sql/sql_select.cc

@@ -8723,10 +8723,10 @@ best_access_path(JOIN      *join,

       if (!cause)

         trace_access_idx.add("rows", records).add("cost", tmp);

-      if (tmp + 0.0001 < best_time - records/TIME_FOR_COMPARE)

+      if (tmp + 0.0001 < best_time - (records*record_count)/TIME_FOR_COMPARE)

       {

         trace_access_idx.add("chosen", true);

-        best_time= COST_ADD(tmp, records/TIME_FOR_COMPARE);

+        best_time= COST_ADD(tmp, (records*record_count)/TIME_FOR_COMPARE);

         best= tmp;

         best_records= records;

         best_key= start_key;