summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvva@eagle.mysql.r18.ru <>2002-12-19 09:37:33 +0400
committervva@eagle.mysql.r18.ru <>2002-12-19 09:37:33 +0400
commit9a0780cce0fbfad517c39578907929527c91c641 (patch)
treed14285ca9c4db7be28d4e547691cfa115966058c
parentdbc8dca835cf69c360abd8e859498b058886abd4 (diff)
downloadmariadb-git-9a0780cce0fbfad517c39578907929527c91c641.tar.gz
fix warnings
-rw-r--r--libmysql/libmysql.c4
-rw-r--r--libmysqld/libmysqld.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index c904fcfe28f..87093059d92 100644
--- 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;
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index cfbd3157476..114a7ebf921 100644
--- 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;