summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-04-09 15:47:25 +0200
committerSergei Golubchik <sergii@pisem.net>2013-04-09 15:47:25 +0200
commita489ae89b9ffe427963745f13c44e1e4d67494f4 (patch)
tree71b649afbf23e64910df07c20d3f914343a57b07 /sql/sql_plugin.cc
parente5a323e107767ceb5106b85d077d4ac9d2d37778 (diff)
downloadmariadb-git-a489ae89b9ffe427963745f13c44e1e4d67494f4.tar.gz
fix mysql_rm_table_no_locks() not to use dd_frm_type, because the frm file
may not exist (the table exists only in the engine).
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r--sql/sql_plugin.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 0406f8190a8..d6a64b38446 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -906,7 +906,8 @@ static plugin_ref intern_plugin_lock(LEX *lex, plugin_ref rc)
mysql_mutex_assert_owner(&LOCK_plugin);
- if (pi->state & (PLUGIN_IS_READY | PLUGIN_IS_UNINITIALIZED))
+ if (pi->state & (PLUGIN_IS_READY | PLUGIN_IS_UNINITIALIZED |
+ PLUGIN_IS_DELETED))
{
plugin_ref plugin;
#ifdef DBUG_OFF