diff options
| author | unknown <istruewing@chilla.local> | 2007-05-31 22:07:44 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-05-31 22:07:44 +0200 |
| commit | 92f59fc73d09c7b8d304ab61ab9463c556bdca5f (patch) | |
| tree | fbbcbd086ee6b748545711c3fee59ab42872ef47 | |
| parent | edd98ca5dbbbf9aea3451ae1da2c770576a04aec (diff) | |
| download | mariadb-git-92f59fc73d09c7b8d304ab61ab9463c556bdca5f.tar.gz | |
post-merge fix
| -rw-r--r-- | sql/sql_plugin.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 2c5fb75e575..c0161463550 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -307,7 +307,7 @@ static st_plugin_dl *plugin_dl_insert_or_reuse(struct st_plugin_dl *plugin_dl) DBUG_RETURN(0); tmp= *dynamic_element(&plugin_dl_array, plugin_dl_array.elements - 1, struct st_plugin_dl **)= - (struct st_plugin_dl *) memdup_root(&plugin_mem_root, (gptr)plugin_dl, + (struct st_plugin_dl *) memdup_root(&plugin_mem_root, (uchar*)plugin_dl, sizeof(struct st_plugin_dl)); DBUG_RETURN(tmp); } @@ -683,7 +683,7 @@ static st_plugin_int *plugin_insert_or_reuse(struct st_plugin_int *plugin) DBUG_RETURN(0); tmp= *dynamic_element(&plugin_array, plugin_array.elements - 1, struct st_plugin_int **)= - (struct st_plugin_int *) memdup_root(&plugin_mem_root, (gptr)plugin, + (struct st_plugin_int *) memdup_root(&plugin_mem_root, (uchar*)plugin, sizeof(struct st_plugin_int)); DBUG_RETURN(tmp); } @@ -1244,7 +1244,7 @@ static bool register_builtin(struct st_mysql_plugin *plugin, *ptr= *dynamic_element(&plugin_array, plugin_array.elements - 1, struct st_plugin_int **)= - (struct st_plugin_int *) memdup_root(&plugin_mem_root, (gptr)tmp, + (struct st_plugin_int *) memdup_root(&plugin_mem_root, (uchar*)tmp, sizeof(struct st_plugin_int)); if (my_hash_insert(&plugin_hash[plugin->type],(uchar*) *ptr)) |