fix warnings

parent dbc8dca8
...@@ -937,7 +937,7 @@ static TYPELIB option_types={array_elements(default_options)-1, ...@@ -937,7 +937,7 @@ static TYPELIB option_types={array_elements(default_options)-1,
static int add_init_command(struct st_mysql_options *options, const char *cmd) static int add_init_command(struct st_mysql_options *options, const char *cmd)
{ {
char **ptr, *tmp; char *tmp;
if (!options->init_commands) if (!options->init_commands)
{ {
...@@ -947,7 +947,7 @@ static int add_init_command(struct st_mysql_options *options, const char *cmd) ...@@ -947,7 +947,7 @@ static int add_init_command(struct st_mysql_options *options, const char *cmd)
} }
if (!(tmp= my_strdup(cmd,MYF(MY_WME))) || if (!(tmp= my_strdup(cmd,MYF(MY_WME))) ||
insert_dynamic(options->init_commands, &tmp)) insert_dynamic(options->init_commands, (byte*)&tmp))
{ {
my_free(tmp, MYF(MY_ALLOW_ZERO_PTR)); my_free(tmp, MYF(MY_ALLOW_ZERO_PTR));
return 1; return 1;
......
...@@ -453,7 +453,7 @@ static TYPELIB option_types={array_elements(default_options)-1, ...@@ -453,7 +453,7 @@ static TYPELIB option_types={array_elements(default_options)-1,
static int add_init_command(struct st_mysql_options *options, const char *cmd) static int add_init_command(struct st_mysql_options *options, const char *cmd)
{ {
char **ptr, *tmp; char *tmp;
if (!options->init_commands) if (!options->init_commands)
{ {
...@@ -463,7 +463,7 @@ static int add_init_command(struct st_mysql_options *options, const char *cmd) ...@@ -463,7 +463,7 @@ static int add_init_command(struct st_mysql_options *options, const char *cmd)
} }
if (!(tmp= my_strdup(cmd,MYF(MY_WME))) || if (!(tmp= my_strdup(cmd,MYF(MY_WME))) ||
insert_dynamic(options->init_commands, &tmp)) insert_dynamic(options->init_commands, (byte*)&tmp))
{ {
my_free(tmp, MYF(MY_ALLOW_ZERO_PTR)); my_free(tmp, MYF(MY_ALLOW_ZERO_PTR));
return 1; return 1;
......
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