From f8970214f7611b5c9cc6750747e445668d35991f Mon Sep 17 00:00:00 2001
From: unknown <msvensson@shellback.>
Date: Mon, 10 Apr 2006 18:34:18 +0200
Subject: Remove unused variables and label

libmysqld/lib_sql.cc:
  Remove unused variable and unused label
server-tools/instance-manager/guardian.cc:
  Remove unused variable
server-tools/instance-manager/mysql_connection.cc:
  Add cast to avoid warning
sql/ha_partition.cc:
  Remove unused variable(s) and an unused label
---
 sql/ha_partition.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'sql')

diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 7cf841a5d71..2254fb5583a 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -1135,7 +1135,6 @@ int ha_partition::handle_opt_partitions(THD *thd, HA_CHECK_OPT *check_opt,
     partition_element *part_elem= part_it++;
     if (all_parts || part_elem->part_state == PART_CHANGED)
     {
-      handler *file;
       if (m_is_sub_partitioned)
       {
         List_iterator<partition_element> sub_it(part_elem->subpartitions);
@@ -2311,7 +2310,7 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
 err_handler:
   while (file-- != m_file)
     (*file)->close();
-err:
+
   DBUG_RETURN(error);
 }
 
@@ -2915,7 +2914,6 @@ int ha_partition::rnd_init(bool scan)
   int error;
   uint i= 0;
   uint32 part_id;
-  handler **file;
   DBUG_ENTER("ha_partition::rnd_init");
 
   include_partition_fields_in_used_fields();
-- 
cgit v1.2.1


From ea28e412ecac5bf2d6da8b613b68e034fc7ffb3c Mon Sep 17 00:00:00 2001
From: unknown <msvensson@shellback.>
Date: Tue, 11 Apr 2006 12:15:57 +0200
Subject: Remove unused variable

---
 sql/sql_delete.cc  | 1 -
 sql/sql_handler.cc | 1 -
 2 files changed, 2 deletions(-)

(limited to 'sql')

diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 804270992e5..4365d5b04ce 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -870,7 +870,6 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
   TABLE *table;
   bool error;
   uint closed_log_tables= 0, lock_logger= 0;
-  TABLE_LIST *tmp_table_list;
   uint path_length;
   DBUG_ENTER("mysql_truncate");
 
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index 9dfa20da522..18b63ba49a3 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -337,7 +337,6 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables,
                    ha_rows select_limit_cnt, ha_rows offset_limit_cnt)
 {
   TABLE_LIST    *hash_tables;
-  TABLE         **table_ptr;
   TABLE         *table;
   MYSQL_LOCK    *lock;
   List<Item>	list;
-- 
cgit v1.2.1