Commit 1b7a4abf authored by jani@ua141d10.elisa.omakaista.fi's avatar jani@ua141d10.elisa.omakaista.fi

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
parents d6903c45 8e1dac44
...@@ -230,7 +230,10 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)), ...@@ -230,7 +230,10 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)),
char *user, char *password, int port,char *tmp_dir) char *user, char *password, int port,char *tmp_dir)
{ {
arg_list_t al; arg_list_t al;
int err= 0, i; int err= 0;
#ifndef __WIN__
int i;
#endif
char trash[FN_REFLEN]; char trash[FN_REFLEN];
/* mysqladmin file */ /* mysqladmin file */
......
...@@ -1716,7 +1716,6 @@ int main(int argc, char **argv) ...@@ -1716,7 +1716,6 @@ int main(int argc, char **argv)
int* handle; int* handle;
char test[FN_LEN]; char test[FN_LEN];
char mask[FN_REFLEN]; char mask[FN_REFLEN];
char *p;
int position; int position;
/* single test */ /* single test */
......
...@@ -3252,7 +3252,6 @@ Item *get_system_var(THD *thd, enum_var_type var_type, LEX_STRING name, ...@@ -3252,7 +3252,6 @@ Item *get_system_var(THD *thd, enum_var_type var_type, LEX_STRING name,
LEX_STRING component) LEX_STRING component)
{ {
sys_var *var; sys_var *var;
char buff[MAX_SYS_VAR_LENGTH*2+4+8], *pos;
LEX_STRING *base_name, *component_name; LEX_STRING *base_name, *component_name;
if (component.str == 0 && if (component.str == 0 &&
......
...@@ -867,7 +867,7 @@ int my_longlong10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)), ...@@ -867,7 +867,7 @@ int my_longlong10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)),
while (long_val != 0) while (long_val != 0)
{ {
long quo= long_val/10; long quo= long_val/10;
*--p = '0' + (long_val - quo*10); *--p = (char) ('0' + (long_val - quo*10));
long_val= quo; long_val= quo;
} }
......
...@@ -1043,7 +1043,7 @@ int my_ll10tostr_ucs2(CHARSET_INFO *cs __attribute__((unused)), ...@@ -1043,7 +1043,7 @@ int my_ll10tostr_ucs2(CHARSET_INFO *cs __attribute__((unused)),
while (long_val != 0) while (long_val != 0)
{ {
long quo= long_val/10; long quo= long_val/10;
*--p = '0' + (long_val - quo*10); *--p = (char) ('0' + (long_val - quo*10));
long_val= quo; long_val= quo;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment