From f0cf48a0c450d5cb4f3bd4f89a3e0b2135403e56 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 8 Mar 2010 14:57:32 +0100 Subject: small code cleanup - "good ifdef is no ifdef" --- sql/handler.cc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'sql/handler.cc') diff --git a/sql/handler.cc b/sql/handler.cc index 198522f2e56..72c78727111 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -82,7 +82,7 @@ static plugin_ref ha_default_plugin(THD *thd) { if (thd->variables.table_plugin) return thd->variables.table_plugin; - return my_plugin_lock(thd, &global_system_variables.table_plugin); + return my_plugin_lock(thd, global_system_variables.table_plugin); } @@ -163,13 +163,8 @@ plugin_ref ha_lock_engine(THD *thd, handlerton *hton) { if (hton) { - st_plugin_int **plugin= hton2plugin + hton->slot; - -#ifdef DBUG_OFF - return my_plugin_lock(thd, plugin); -#else - return my_plugin_lock(thd, &plugin); -#endif + st_plugin_int *plugin= hton2plugin[hton->slot]; + return my_plugin_lock(thd, plugin_int_to_ref(plugin)); } return NULL; } -- cgit v1.2.1