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/handler.h | |
| 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/handler.h')
| -rw-r--r-- | sql/handler.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index 69b84657ad5..037c7763064 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1668,7 +1668,8 @@ static inline LEX_CSTRING *hton_name(const handlerton *hton) static inline handlerton *plugin_hton(plugin_ref plugin) { - return plugin_data(plugin, handlerton *); + return + reinterpret_cast<st_mysql_storage_engine*>(plugin_decl(plugin)->info)->hton; } static inline sys_var *find_hton_sysvar(handlerton *hton, st_mysql_sys_var *var) |