Fixed compiler warnings

sql/item_subselect.cc:
  Added purecov info
sql/sql_select.cc:
  Added cast
storage/innobase/handler/ha_innodb.cc:
  Added cast
storage/xtradb/btr/btr0btr.c:
  Added buf_block_get_frame_fast() to avoid compiler warning
storage/xtradb/handler/ha_innodb.cc:
  Added cast
storage/xtradb/include/buf0buf.h:
  Innodb has buf_block_get_frame(block) defined as (block)->frame.
  Didn't want to do a big change to break xtradb as it may use block_get_frame() differently, so I mad this quick hack to patch one compiler warning.

2 files changed, 7 insertions, 1 deletions

diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 8b9904ea260..cedc4ccb834 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -5169,13 +5169,17 @@ Ordered_key::cmp_keys_by_row_data(ha_rows a, ha_rows b)
   /* Fetch the rows for comparison. */
   if ((error= tbl->file->ha_rnd_pos(tbl->record[0], rowid_a)))
   {
+    /* purecov: begin inspected */
     tbl->file->print_error(error, MYF(ME_FATALERROR));  // Sets fatal_error
     return 0;
+    /* purecov: end */
   }
   if ((error= tbl->file->ha_rnd_pos(tbl->record[1], rowid_b)))
   {
+    /* purecov: begin inspected */
     tbl->file->print_error(error, MYF(ME_FATALERROR));  // Sets fatal_error
     return 0;
+    /* purecov: end */
   }    
   /*
     Compare the two rows by the corresponding values of the indexed
@@ -5253,8 +5257,10 @@ int Ordered_key::cmp_key_with_search_key(rownum_t row_num)
 
   if ((error= tbl->file->ha_rnd_pos(tbl->record[0], cur_rowid)))
   {
+    /* purecov: begin inspected */
     tbl->file->print_error(error, MYF(ME_FATALERROR));  // Sets fatal_error
     return 0;
+    /* purecov: end */
   }
 
   for (uint i= 0; i < key_column_count; i++)
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 165e257d42d..720b4e418d7 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -6657,7 +6657,7 @@ double JOIN::get_examined_rows()
   while ((tab= next_breadth_first_tab(this, tab)))
   {
     prev_fanout *= prev_tab->records_read;
-    examined_rows+= tab->get_examined_rows() * prev_fanout;
+    examined_rows+= (ha_rows) (tab->get_examined_rows() * prev_fanout);
     prev_tab= tab;
   }
   return examined_rows;