fix warnings

9a0780cc · vva@eagle.mysql.r18.ru · dbc8dca8 · 9a0780cc · 9a0780cc
Commit 9a0780cc authored Dec 19, 2002 by vva@eagle.mysql.r18.ru
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

libmysql/libmysql.c libmysql/libmysql.c +2 -2

libmysqld/libmysqld.c libmysqld/libmysqld.c +2 -2

No files found.
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -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)
 {
-  char **ptr, *tmp;
+  char *tmp;

  if (!options->init_commands)
  {
@@ -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))) ||
-      insert_dynamic(options->init_commands, &tmp))
+      insert_dynamic(options->init_commands, (byte*)&tmp))
  {
    my_free(tmp, MYF(MY_ALLOW_ZERO_PTR));
    return 1;

--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -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)
 {
-  char **ptr, *tmp;
+  char *tmp;

  if (!options->init_commands)
  {
@@ -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))) ||
-      insert_dynamic(options->init_commands, &tmp))
+      insert_dynamic(options->init_commands, (byte*)&tmp))
  {
    my_free(tmp, MYF(MY_ALLOW_ZERO_PTR));
    return 1;