diff options
author | hf@deer.mysql.r18.ru <> | 2002-12-19 14:57:24 +0400 |
---|---|---|
committer | hf@deer.mysql.r18.ru <> | 2002-12-19 14:57:24 +0400 |
commit | 8a205e4ba309c4031df93cfe700891d362e25750 (patch) | |
tree | 49af941597a25a7ac4b9152abdbeba746334ac2e /libmysqld/libmysqld.c | |
parent | 1873df00a5c8d3a92086623db3dd90bfec4b5221 (diff) | |
parent | c3053148f489b36378efa3bdf6676ca0334f69d1 (diff) | |
download | mariadb-git-8a205e4ba309c4031df93cfe700891d362e25750.tar.gz |
Merge
Diffstat (limited to 'libmysqld/libmysqld.c')
-rw-r--r-- | libmysqld/libmysqld.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index d6883dde3f9..181b77130be 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -231,7 +231,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, (gptr)&tmp)) + insert_dynamic(options->init_commands, (byte*)&tmp)) { my_free(tmp, MYF(MY_ALLOW_ZERO_PTR)); return 1; |