From 6f18b703e168d6d6f7c94712aa3c7e52c23f6c52 Mon Sep 17 00:00:00 2001
From: unknown <jani@ua141d10.elisa.omakaista.fi>
Date: Tue, 18 Oct 2005 18:03:26 +0300
Subject: Some fixes to avoid compiler warnings.

mysql-test/my_manage.c:
  Avoid warning: i not used in case of Windows.
mysql-test/mysql_test_run_new.c:
  Removed unused variable.
sql/item_func.cc:
  Removed unused variables.
strings/ctype-simple.c:
  Added cast.
strings/ctype-ucs2.c:
  Added cast.
---
 mysql-test/my_manage.c          | 5 ++++-
 mysql-test/mysql_test_run_new.c | 1 -
 sql/item_func.cc                | 1 -
 strings/ctype-simple.c          | 2 +-
 strings/ctype-ucs2.c            | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mysql-test/my_manage.c b/mysql-test/my_manage.c
index 88e68dfc27e..919d3bd0529 100644
--- a/mysql-test/my_manage.c
+++ b/mysql-test/my_manage.c
@@ -230,7 +230,10 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)),
                           char *user, char *password, int port,char *tmp_dir)
 {
   arg_list_t al;
-  int err= 0, i;
+  int err= 0;
+#ifndef __WIN__
+  int i;
+#endif
   char trash[FN_REFLEN];
 
   /* mysqladmin file */
diff --git a/mysql-test/mysql_test_run_new.c b/mysql-test/mysql_test_run_new.c
index 40e45a92851..8beebefd298 100644
--- a/mysql-test/mysql_test_run_new.c
+++ b/mysql-test/mysql_test_run_new.c
@@ -1716,7 +1716,6 @@ int main(int argc, char **argv)
       int* handle;
       char test[FN_LEN];
       char mask[FN_REFLEN];
-      char *p;
       int position;
 
       /* single test */
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 288859443ff..df32672e12b 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -3252,7 +3252,6 @@ Item *get_system_var(THD *thd, enum_var_type var_type, LEX_STRING name,
 		     LEX_STRING component)
 {
   sys_var *var;
-  char buff[MAX_SYS_VAR_LENGTH*2+4+8], *pos;
   LEX_STRING *base_name, *component_name;
 
   if (component.str == 0 &&
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index efddab621f2..095b2f3a4ac 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -867,7 +867,7 @@ int my_longlong10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)),
   while (long_val != 0)
   {
     long quo= long_val/10;
-    *--p = '0' + (long_val - quo*10);
+    *--p = (char) ('0' + (long_val - quo*10));
     long_val= quo;
   }
   
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 56c05635300..ad07fd9903c 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -1043,7 +1043,7 @@ int my_ll10tostr_ucs2(CHARSET_INFO *cs __attribute__((unused)),
   while (long_val != 0)
   {
     long quo= long_val/10;
-    *--p = '0' + (long_val - quo*10);
+    *--p = (char) ('0' + (long_val - quo*10));
     long_val= quo;
   }
   
-- 
cgit v1.2.1