summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
diff options
context:
space:
mode:
authoracurtis/antony@xiphis.org/ltamd64.xiphis.org <>2006-09-25 11:48:51 -0700
committeracurtis/antony@xiphis.org/ltamd64.xiphis.org <>2006-09-25 11:48:51 -0700
commit5f14652ef5039138f1f2f69f1edcd8c647150f9e (patch)
tree565989e0e95b5dc26aae85d42cbc6f1afd333e34 /sql/sql_plugin.cc
parent6414330377717dbc73564acec7eeebddc7ab28df (diff)
downloadmariadb-git-5f14652ef5039138f1f2f69f1edcd8c647150f9e.tar.gz
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.
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r--sql/sql_plugin.cc2
1 files changed, 1 insertions, 1 deletions
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);
}