diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc
index 96f760a7a44..02af9fb6918 100644
--- a/sql/ha_heap.cc
+++ b/sql/ha_heap.cc
@@ -524,7 +524,6 @@ THR_LOCK_DATA **ha_heap::store_lock(THD *thd,
 
 int ha_heap::delete_table(const char *name)
 {
-  char buff[FN_REFLEN];
   int error= heap_delete_table(name);
   return error == ENOENT ? 0 : error;
 }
diff --git a/sql/handler.cc b/sql/handler.cc
index 16381972200..782d367bf40 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -445,8 +445,6 @@ static my_bool init_handlerton(THD *unused1, st_plugin_int *plugin,
 int ha_init()
 {
   int error= 0;
-  handlerton **types;
-  show_table_alias_st *table_alias;
   total_ha= savepoint_alloc_size= 0;
 
   if (ha_init_errors())
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index c4f7dec70d0..7ee206a4195 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -2028,7 +2028,6 @@ void Item_date_add_interval::fix_length_and_dec()
 
 bool Item_date_add_interval::get_date(TIME *ltime, uint fuzzy_date)
 {
-  long period,sign;
   INTERVAL interval;
 
   if (args[0]->get_date(ltime, TIME_NO_ZERO_DATE) ||
diff --git a/sql/key.cc b/sql/key.cc
index 4001c6177a1..fd9e8a89b17 100644
--- a/sql/key.cc
+++ b/sql/key.cc
@@ -468,7 +468,6 @@ int key_rec_cmp(void *key, byte *first_rec, byte *second_rec)
   do
   {
     Field *field= key_part->field;
-    uint length;
 
     if (key_part->null_bit)
     {
diff --git a/sql/log.cc b/sql/log.cc
index 02bf5ec3015..4b5fcffffbf 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -717,8 +717,6 @@ bool LOGGER::slow_log_print(THD *thd, const char *query, uint query_length,
   bool error= FALSE;
   Log_event_handler **current_handler= slow_log_handler_list;
   bool is_command= FALSE;
-
-  char message_buff[MAX_LOG_BUFFER_SIZE];
   char user_host_buff[MAX_USER_HOST_SIZE];
 
   my_time_t current_time;
diff --git a/sql/sp.cc b/sql/sp.cc
index 022417d15d1..ac63847daa3 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -668,7 +668,6 @@ db_update_routine(THD *thd, int type, sp_name *name, st_sp_chistics *chistics)
 {
   TABLE *table;
   int ret;
-  bool opened;
   DBUG_ENTER("db_update_routine");
   DBUG_PRINT("enter", ("type: %d name: %.*s",
 		       type, name->m_name.length, name->m_name.str));
diff --git a/sql/sp_cache.cc b/sql/sp_cache.cc
index fea6a67f32c..f5912caddaf 100644
--- a/sql/sp_cache.cc
+++ b/sql/sp_cache.cc
@@ -124,7 +124,6 @@ void sp_cache_clear(sp_cache **cp)
 void sp_cache_insert(sp_cache **cp, sp_head *sp)
 {
   sp_cache *c;
-  ulong v;
 
   if (!(c= *cp))
   {
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 6c2ca06164f..9f01f763f41 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1408,10 +1408,7 @@ void update_non_unique_table_error(TABLE_LIST *update,
 
 TABLE *find_temporary_table(THD *thd, const char *db, const char *table_name)
 {
-  char	key[MAX_DBKEY_LENGTH];
-  uint	key_length;
   TABLE_LIST table_list;
-  TABLE *table;
 
   table_list.db= (char*) db;
   table_list.table_name= (char*) table_name;
@@ -1939,7 +1936,6 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
   }
   else
   {
-    TABLE_SHARE *share;
     /* Free cache if too big */
     while (open_cache.records > table_cache_size && unused_tables)
       VOID(hash_delete(&open_cache,(byte*) unused_tables)); /* purecov: tested */