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_show.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_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 43914a0003d..471dac34a2c 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -6004,7 +6004,7 @@ static my_bool iter_schema_engines(THD *thd, plugin_ref plugin, void *ptable) { TABLE *table= (TABLE *) ptable; - handlerton *hton= plugin_hton(plugin); + handlerton *hton; const char *wild= thd->lex->wild ? thd->lex->wild->ptr() : NullS; CHARSET_INFO *scs= system_charset_info; handlerton *default_type= ha_default_handlerton(thd); @@ -6029,6 +6029,7 @@ static my_bool iter_schema_engines(THD *thd, plugin_ref plugin, DBUG_RETURN(0); } + hton= plugin_hton(plugin); if (!(hton->flags & HTON_HIDDEN)) { LEX_CSTRING *name= plugin_name(plugin); |