Compiler warning about assigned but not used variables fixed.

6 files changed, 9 insertions, 16 deletions

diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 887067ff8b1..e1574bdf5de 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -5810,7 +5810,6 @@ Item* Item_equal::get_first(Item *field_item)
 {
   Item_equal_fields_iterator it(*this);
   Item *item;
-  JOIN_TAB *field_tab;
   if (!field_item)
     return (it++);
   Field *field= ((Item_field *) (field_item->real_item()))->field;
@@ -5835,8 +5834,6 @@ Item* Item_equal::get_first(Item *field_item)
     in presense of SJM nests.
   */
 
-  field_tab= field->table->reginfo.join_tab;
-
   TABLE_LIST *emb_nest= field->table->pos_in_table_list->embedding;
 
   if (emb_nest && emb_nest->sj_mat_info && emb_nest->sj_mat_info->is_used)
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 0f12f6755ed..3a1e3a93f72 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -2436,7 +2436,6 @@ bool Item_func_add_time::get_date(MYSQL_TIME *ltime, uint fuzzy_date)
   long days, microseconds;
   longlong seconds;
   int l_sign= sign, was_cut= 0;
-  uint dec= decimals;
 
   if (is_date)                        // TIMESTAMP function
   {
@@ -2478,10 +2477,6 @@ bool Item_func_add_time::get_date(MYSQL_TIME *ltime, uint fuzzy_date)
 
   ltime->time_type= is_time ? MYSQL_TIMESTAMP_TIME : MYSQL_TIMESTAMP_DATETIME;
 
-  if (cached_field_type == MYSQL_TYPE_STRING &&
-      (l_time1.second_part || l_time2.second_part))
-    dec= TIME_SECOND_PART_DIGITS;
-
   if (!is_time)
   {
     get_date_from_daynr(days,&ltime->year,&ltime->month,&ltime->day);
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc
index 08e91559fc6..6e11fe5efa0 100644
--- a/sql/multi_range_read.cc
+++ b/sql/multi_range_read.cc
@@ -1636,7 +1636,8 @@ bool DsMrr_impl::get_disk_sweep_mrr_cost(uint keynr, ha_rows rows, uint flags,
                                          uint *buffer_size, COST_VECT *cost)
 {
   ulong max_buff_entries, elem_size;
-  ha_rows rows_in_full_step, rows_in_last_step;
+  ha_rows rows_in_full_step;
+  ha_rows rows_in_last_step;
   uint n_full_steps;
   double index_read_cost;
 
@@ -1661,7 +1662,7 @@ bool DsMrr_impl::get_disk_sweep_mrr_cost(uint keynr, ha_rows rows, uint flags,
   /* Adjust buffer size if we expect to use only part of the buffer */
   if (n_full_steps)
   {
-    get_sort_and_sweep_cost(table, rows, cost);
+    get_sort_and_sweep_cost(table, rows_in_full_step, cost);
     cost->multiply(n_full_steps);
   }
   else
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index 08afa4b12fb..416dcadc67f 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -3385,7 +3385,7 @@ TABLE *create_duplicate_weedout_tmp_table(THD *thd,
   bool using_unique_constraint=FALSE;
   bool use_packed_rows= FALSE;
   Field *field, *key_field;
-  uint blob_count, null_pack_length, null_count;
+  uint null_pack_length, null_count;
   uchar *null_flags;
   uchar *pos;
   DBUG_ENTER("create_duplicate_weedout_tmp_table");
@@ -3466,8 +3466,6 @@ TABLE *create_duplicate_weedout_tmp_table(THD *thd,
   share->keys_for_keyread.init();
   share->keys_in_use.init();
 
-  blob_count= 0;
-
   /* Create the field */
   {
     /*
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 08cdf7459fd..41e1734f346 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1274,7 +1274,7 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
   handler *file= table->file;
   TABLE_SHARE *share= table->s;
   HA_CREATE_INFO create_info;
-  bool show_table_options= FALSE;
+  bool show_table_options __attribute__ ((unused))= FALSE;
   bool foreign_db_mode=  (thd->variables.sql_mode & (MODE_POSTGRESQL |
                                                      MODE_ORACLE |
                                                      MODE_MSSQL |
@@ -1507,7 +1507,9 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
   packet->append(STRING_WITH_LEN("\n)"));
   if (!(thd->variables.sql_mode & MODE_NO_TABLE_OPTIONS) && !foreign_db_mode)
   {
+#ifdef WITH_PARTITION_STORAGE_ENGINE
     show_table_options= TRUE;
+#endif
     /*
       Get possible table space definitions and append them
       to the CREATE TABLE statement
diff --git a/sql/table.cc b/sql/table.cc
index d54135b5620..2acd11e3fd2 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -5378,7 +5378,7 @@ void TABLE::use_index(int key_to_save)
     /* Drop all keys; */
     i= 0;
 
-  s->keys= (key_to_save < 0) ? 0 : 1;
+  s->keys= i;
 }
 
 /**
@@ -5689,7 +5689,7 @@ int update_virtual_fields(THD *thd, TABLE *table, bool for_write)
 {
   DBUG_ENTER("update_virtual_fields");
   Field **vfield_ptr, *vfield;
-  int error= 0;
+  int error __attribute__ ((unused))= 0;
   if (!table || !table->vfield)
     DBUG_RETURN(0);