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/table.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/table.cc')
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 7ed5121a9c6..0640f80fd84 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1920,7 +1920,7 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, sql_print_warning("%s.frm is inconsistent: engine typecode %d, engine name %s (%d)", share->normalized_path.str, legacy_db_type, plugin_name(tmp_plugin)->str, - ha_legacy_type(plugin_data(tmp_plugin, handlerton *))); + ha_legacy_type(plugin_hton(tmp_plugin))); } /* tmp_plugin is locked with a local lock. |