diff options
| author | vva@eagle.mysql.r18.ru <> | 2002-12-19 09:38:24 +0400 |
|---|---|---|
| committer | vva@eagle.mysql.r18.ru <> | 2002-12-19 09:38:24 +0400 |
| commit | acc4c439158c2ea6f88945074d72bc7f6ce1e5f0 (patch) | |
| tree | 4153f4ac671e5ae630ac044190e54662f06f4fa4 | |
| parent | e56fb1962f76c701da00b9847c97f18967172b17 (diff) | |
| parent | 9a0780cce0fbfad517c39578907929527c91c641 (diff) | |
| download | mariadb-git-acc4c439158c2ea6f88945074d72bc7f6ce1e5f0.tar.gz | |
Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/MANY_INIT_COMMANDS/4.1
| -rw-r--r-- | libmysql/libmysql.c | 4 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 4 |
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; |