bzr commit into mysql-6.0-opt-subqueries branch (sergefp:2681)

[Sergey Petrunia]

#At file:///home/psergey/dev/mysql-6.0-subq-r14/

 2681 Sergey Petrunia	2008-07-27
      - use rows2double, fix conversion warning
      - fix typo bug in loosescan handling
modified:
  sql/sql_select.cc

per-file messages:
  sql/sql_select.cc
    - use rows2double, fix conversion warning
    - fix typo bug in loosescan handling
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2008-07-26 19:37:13 +0000
+++ b/sql/sql_select.cc	2008-07-26 22:42:13 +0000
@@ -5995,7 +5995,8 @@ public:
     {
       best_loose_scan_key= quick->index;
       best_loose_scan_cost= quick->read_time;
-      best_loose_scan_records= quick->records; /* ok because idx == join->const_tables */
+      /* this is ok because idx == join->const_tables */
+      best_loose_scan_records= rows2double(quick->records);
       best_max_loose_keypart= quick_max_loose_keypart;
       best_loose_scan_start_key= NULL;
     }
@@ -7791,7 +7792,7 @@ get_best_combination(JOIN *join, table_m
         Re-run best_access_path to produce best access methods that do not use
         join buffering
       */ 
-      for (uint idx= first; idx <= tablenr; i++)
+      for (uint idx= first; idx <= tablenr; idx++)
       {
         if (join->best_positions[idx].use_join_buffer || (idx == first))
         {