diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2019-11-14 17:45:19 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-11-15 15:23:42 +0400 |
| commit | 7740cb245720f2ecb92e0ca5d6ce8e39a6124679 (patch) | |
| tree | df21c1a27830819438fa01a060314cac2d81a76d /sql/sql_plugin.cc | |
| parent | da6d7f72b0a933ccf10dd78f41b0c32a88c4eb56 (diff) | |
| download | mariadb-git-bb-10.5-robert.tar.gz | |
Don't use plugin->data for storage engine pluginsbb-10.5-robert
Use plugin->plugin->info->hton instead.
plugin_data() replaced with plugin_hton().
plugin_hton() must never return NULL anymore and is only good to be called
against plugins in PLUGIN_IS_READY state.
Part of
MDEV-20044 - Replace dynamic storage engine initialisation with declarative
approach
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 19ea6e31042..1f26187d12d 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1059,7 +1059,7 @@ plugin_ref plugin_lock_by_name(THD *thd, const LEX_CSTRING *name, int type) DBUG_ENTER("plugin_lock_by_name"); mysql_mutex_lock(&LOCK_plugin); if ((plugin= plugin_find_internal(name, type))) - rc= intern_plugin_lock(lex, plugin_int_to_ref(plugin)); + rc= intern_plugin_lock(lex, plugin_int_to_ref(plugin), PLUGIN_IS_READY); mysql_mutex_unlock(&LOCK_plugin); DBUG_RETURN(rc); } |