bk commit into 5.2 tree (gkodinov:1.2596) BUG#30639

[kgeorge]

Below is the list of changes that have just been committed into a local
5.2 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-21 17:23:26+02:00, gkodinov@stripped +3 -0
  fixed type conversion warnings related to bug #30639

  sql/handler.cc@stripped, 2007-09-21 17:23:13+02:00, gkodinov@stripped +4 -4
    fixed type conversion warnings related to bug #30639

  sql/opt_range.cc@stripped, 2007-09-21 17:23:14+02:00, gkodinov@stripped +1 -1
    fixed type conversion warnings related to bug #30639

  sql/sql_select.cc@stripped, 2007-09-21 17:23:15+02:00, gkodinov@stripped +1 -1
    fixed type conversion warnings related to bug #30639

diff -Nrup a/sql/handler.cc b/sql/handler.cc
--- a/sql/handler.cc	2007-09-14 11:17:53 +02:00
+++ b/sql/handler.cc	2007-09-21 17:23:13 +02:00
@@ -3207,7 +3207,7 @@ handler::multi_range_read_info_const(uin
     cost->zero();
     cost->avg_io_cost= 1; /* assume random seeks */
     if ((*flags & HA_MRR_INDEX_ONLY) && total_rows > 2)
-      cost->io_count= index_only_read_time(keyno, total_rows);
+      cost->io_count= index_only_read_time(keyno, (uint)total_rows);
     else
       cost->io_count= read_time(keyno, n_ranges, total_rows);
     cost->cpu_cost= (double) total_rows / TIME_FOR_COMPARE + 0.01;
@@ -3919,10 +3919,10 @@ bool DsMrr_impl::get_disk_sweep_mrr_cost
   if (n_full_steps != 0)
     cost->mem_cost= *buffer_size;
   else
-    cost->mem_cost= rows_in_last_step * elem_size;
+    cost->mem_cost= (double)rows_in_last_step * elem_size;
   
   /* Total cost of all index accesses */
-  index_read_cost= h->index_only_read_time(keynr, rows);
+  index_read_cost= h->index_only_read_time(keynr, (double)rows);
   cost->add_io(index_read_cost, 1 /* Random seeks */);
   return FALSE;
 }
@@ -4016,7 +4016,7 @@ void get_sweep_read_cost(TABLE *table, h
   cost->zero();
   if (table->file->primary_key_is_clustered())
   {
-    cost->io_count= table->file->read_time(table->s->primary_key, nrows, 
+    cost->io_count= table->file->read_time(table->s->primary_key,
(uint)nrows, 
                                            nrows);
   }
   else
diff -Nrup a/sql/opt_range.cc b/sql/opt_range.cc
--- a/sql/opt_range.cc	2007-09-21 12:52:26 +02:00
+++ b/sql/opt_range.cc	2007-09-21 17:23:14 +02:00
@@ -7964,7 +7964,7 @@ QUICK_RANGE_SELECT *get_quick_select_for
 
   quick->mrr_buf_size= thd->variables.read_rnd_buff_size;
   COST_VECT cost;
-  if (table->file->multi_range_read_info(quick->index, 1, records,
+  if (table->file->multi_range_read_info(quick->index, 1, (uint)records,
                                          &quick->mrr_buf_size,
                                          &quick->mrr_flags, &cost))
     goto err;
diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2007-09-21 12:42:28 +02:00
+++ b/sql/sql_select.cc	2007-09-21 17:23:15 +02:00
@@ -5409,7 +5409,7 @@ best_access_path(JOIN      *join,
                 
                 Calculate the cost of complete loose index scan. 
               */
-              records= s->table->file->stats.records;
+              records= (double)s->table->file->stats.records;
 
               /* The cost is entire index scan cost (divided by 2) */
               best_time= s->table->file->index_only_read_time(key, records);