bk commit into 5.1 tree (istruewing:1.2518)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-31 22:07:44+02:00, istruewing@stripped +1 -0
  post-merge fix

  sql/sql_plugin.cc@stripped, 2007-05-31 22:07:39+02:00, istruewing@stripped +3 -3
    post-merge fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-axmrg

--- 1.68/sql/sql_plugin.cc	2007-05-31 22:08:12 +02:00
+++ 1.69/sql/sql_plugin.cc	2007-05-31 22:08:12 +02:00
@@ -307,7 +307,7 @@ static st_plugin_dl *plugin_dl_insert_or
     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_r
     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_m
 
   *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))