From 07ef7461a0f859601784a94b1014ce66e7a6a528 Mon Sep 17 00:00:00 2001
From: unknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org>
Date: Mon, 25 Sep 2006 11:48:51 -0700
Subject: [PATCH] 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:
  Bug#20615
    Don't delete the plugin if it wasn't added.
---
 sql/sql_plugin.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 1a3626acaf6..34fb447792e 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -864,8 +864,8 @@ my_bool mysql_install_plugin(THD *thd, const LEX_STRING *name, const LEX_STRING
   DBUG_RETURN(FALSE);
 deinit:
   plugin_deinitialize(tmp);
-err:
   plugin_del(tmp);
+err:
   rw_unlock(&THR_LOCK_plugin);
   DBUG_RETURN(TRUE);
 }