bk commit into 6.0 tree (hakank:1.2625) BUG#31466

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakan. When hakan 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-10-09 09:21:21+02:00, hakank@lu0011.(none) +4 -0
  Fix compiler warnings (Bug#31466).

  sql/handler.cc@stripped, 2007-10-09 09:21:17+02:00, hakank@lu0011.(none) +4 -4
    Fix compiler warnings (Bug#31466).

  sql/opt_range.cc@stripped, 2007-10-09 09:21:18+02:00, hakank@lu0011.(none) +1 -1
    Fix compiler warnings (Bug#31466).

  sql/sql_select.cc@stripped, 2007-10-09 09:21:18+02:00, hakank@lu0011.(none) +7 -7
    Fix compiler warnings (Bug#31466).

  storage/falcon/ha_falcon.cpp@stripped, 2007-10-09 09:21:18+02:00, hakank@lu0011.(none) +2 -2
    Fix compiler warnings (Bug#31466).

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-10-09 09:21:17 +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;
 }
@@ -4017,7 +4017,7 @@ void get_sweep_read_cost(TABLE *table, h
   if (table->file->primary_key_is_clustered())
   {
     cost->io_count= table->file->read_time(table->s->primary_key, nrows, 
-                                           nrows);
+                                           (uint)nrows);
   }
   else
   {
diff -Nrup a/sql/opt_range.cc b/sql/opt_range.cc
--- a/sql/opt_range.cc	2007-10-04 22:18:55 +02:00
+++ b/sql/opt_range.cc	2007-10-09 09:21:18 +02:00
@@ -7966,7 +7966,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-10-04 22:04:12 +02:00
+++ b/sql/sql_select.cc	2007-10-09 09:21:18 +02:00
@@ -5383,24 +5383,24 @@ best_access_path(JOIN      *join,
               (PREV_BITS(uint, n_fixed_parts) | sj_insideout_map) ==
                PREV_BITS(uint, keyinfo->key_parts))
           {
-            /* 
-              Not all parts are fixed. Produce bitmap of remaining bits and 
+            /*
+              Not all parts are fixed. Produce bitmap of remaining bits and
               check if all of them are covered.
             */
             sj_inside_out_scan= TRUE;
             DBUG_PRINT("info", ("Using sj InsideOut scan"));
             if (!n_fixed_parts)
             {
-              /* 
+              /*
                 It's a confluent ref scan.
 
-                That is, all found KEYUSE elements refer to IN-equalities, 
+                That is, all found KEYUSE elements refer to IN-equalities,
                 and there is really no ref access because there is no
                   t.keypart0 = {bound expression}
-                
-                Calculate the cost of complete loose index scan. 
+
+                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);
diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp	2007-09-28 22:08:55 +02:00
+++ b/storage/falcon/ha_falcon.cpp	2007-10-09 09:21:18 +02:00
@@ -563,7 +563,7 @@ void StorageInterface::getDemographics(v
 			for (uint segment = 0; segment < key->key_parts; ++segment, n >>= 1)
 				{
 				ha_rows recordsPerSegment = (ha_rows) desc->segmentRecordCounts[segment];
-				key->rec_per_key[segment] = MAX(recordsPerSegment, n);
+				key->rec_per_key[segment] = MAX((uint)recordsPerSegment, n);
 				}
 			}
 		}
@@ -1464,7 +1464,7 @@ int StorageInterface::index_next_same(uc
 double StorageInterface::scan_time(void)
 {
 	DBUG_ENTER("StorageInterface::scan_time");
-	DBUG_RETURN(stats.records * 1000);
+	DBUG_RETURN((double)stats.records * 1000);
 }
 
 bool StorageInterface::threadSwitch(THD* newThread)