diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-16 13:04:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-16 13:04:42 +0200 |
| commit | ee9afef27141f55165009fdbd58e54942f3a6867 (patch) | |
| tree | b5e15e62e10daa40aef3e6d33eeabf9205d1be0f /sql/sql_plugin.cc | |
| parent | d9a8799205d160688f81362356dd2323eb8a91ea (diff) | |
| parent | a619bfad30c13207fb0453a85af5740846186900 (diff) | |
| download | mariadb-git-ee9afef27141f55165009fdbd58e54942f3a6867.tar.gz | |
mysql-5.5.28
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 3b55402bab3..dee48a28037 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -274,7 +274,7 @@ public: (plugin_var_arg->flags & PLUGIN_VAR_THDLOCAL ? SESSION : GLOBAL) | (plugin_var_arg->flags & PLUGIN_VAR_READONLY ? READONLY : 0), 0, -1, NO_ARG, pluginvar_show_type(plugin_var_arg), 0, 0, - VARIABLE_NOT_IN_BINLOG, 0, 0, 0, 0), + VARIABLE_NOT_IN_BINLOG, NULL, NULL, NULL), plugin_var(plugin_var_arg), orig_pluginvar_name(plugin_var_arg->name) { plugin_var->name= name_arg; } sys_var_pluginvar *cast_pluginvar() { return this; } @@ -2157,7 +2157,8 @@ static bool do_uninstall(THD *thd, TABLE *table, const LEX_STRING *name) struct st_plugin_int *plugin; mysql_mutex_assert_owner(&LOCK_plugin); - if (!(plugin= plugin_find_internal(name, MYSQL_ANY_PLUGIN))) + if (!(plugin= plugin_find_internal(name, MYSQL_ANY_PLUGIN)) || + plugin->state & (PLUGIN_IS_UNINITIALIZED | PLUGIN_IS_DYING)) { my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "PLUGIN", name->str); return 1; |