bk commit into 5.1 tree (acurtis:1.2278) 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-08-28 03:26:13-07:00, acurtis@stripped +1 -0
  Bug#20615
    "plugin name lost when loading an already-loaded name"
    Do not delete existing plugin when loading a new plugin which has the
    same name.

  sql/sql_plugin.cc@stripped, 2006-08-28 03:26:09-07:00, acurtis@stripped +2 -1
    don't delete existing plugin if plugin to be installed name clashes.

# 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.25/sql/sql_plugin.cc	2006-08-28 03:26:20 -07:00
+++ 1.26/sql/sql_plugin.cc	2006-08-28 03:26:20 -07:00
@@ -831,7 +831,7 @@
 
   rw_wrlock(&THR_LOCK_plugin);
   if (plugin_add(name, dl, REPORT_TO_USER))
-    goto err;
+    goto eexists;
   tmp= plugin_find_internal(name, MYSQL_ANY_PLUGIN);
 
   if (plugin_initialize(tmp))
@@ -861,6 +861,7 @@
     tmp->plugin->deinit();
 err:
   plugin_del(name);
+eexists:
   rw_unlock(&THR_LOCK_plugin);
   DBUG_RETURN(TRUE);
 }