bk commit into 5.1 tree (acurtis:1.2271) BUG#20615

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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, 2006-07-26 13:43:27-07:00, acurtis@stripped +1 -0
  Bug#20615
    "PLUGIN: plugin name lost when loading an already-loaded name"
    if plugin already exists, don't delete it.

  sql/sql_plugin.cc@stripped, 2006-07-26 13:43:25-07:00, acurtis@stripped +6 -0
    Bug#20615
      if plugin already exists, don't delete it.

# 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:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/home/antony/work2/p2-bug20615.1

--- 1.25/sql/sql_plugin.cc	2006-07-26 13:43:37 -07:00
+++ 1.26/sql/sql_plugin.cc	2006-07-26 13:43:37 -07:00
@@ -830,6 +830,11 @@
     DBUG_RETURN(TRUE);
 
   rw_wrlock(&THR_LOCK_plugin);
+  if (plugin_find_internal(name, MYSQL_ANY_PLUGIN))
+  {
+    my_error(ER_UDF_EXISTS, MYF(0), name->str);
+    goto errexists;
+  }  
   if (plugin_add(name, dl, REPORT_TO_USER))
     goto err;
   tmp= plugin_find_internal(name, MYSQL_ANY_PLUGIN);
@@ -861,6 +866,7 @@
     tmp->plugin->deinit();
 err:
   plugin_del(name);
+errexists:
   rw_unlock(&THR_LOCK_plugin);
   DBUG_RETURN(TRUE);
 }