summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2019-11-14 17:45:19 +0400
committerSergey Vojtovich <svoj@mariadb.org>2019-11-15 15:23:42 +0400
commit7740cb245720f2ecb92e0ca5d6ce8e39a6124679 (patch)
treedf21c1a27830819438fa01a060314cac2d81a76d /sql/sql_table.cc
parentda6d7f72b0a933ccf10dd78f41b0c32a88c4eb56 (diff)
downloadmariadb-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_table.cc')
-rw-r--r--sql/sql_table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 1520cc7c705..237b0705b0d 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1139,7 +1139,7 @@ static int execute_ddl_log_action(THD *thd, DDL_LOG_ENTRY *ddl_log_entry)
my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), ddl_log_entry->handler_name);
goto error;
}
- hton= plugin_data(plugin, handlerton*);
+ hton= plugin_hton(plugin);
file= get_new_handler((TABLE_SHARE*)0, &mem_root, hton);
if (unlikely(!file))
goto error;