diff options
| -rw-r--r-- | sql/scheduler.cc | 14 | ||||
| -rw-r--r-- | sql/sql_class.cc | 10 |
2 files changed, 10 insertions, 14 deletions
diff --git a/sql/scheduler.cc b/sql/scheduler.cc index d9a98f37e39..328ad45b4b8 100644 --- a/sql/scheduler.cc +++ b/sql/scheduler.cc @@ -149,10 +149,6 @@ void one_thread_scheduler() thd_scheduler::thd_scheduler() : m_psi(NULL), data(NULL) { -#ifndef DBUG_OFF - dbug_explain[0]= '\0'; - set_explain= FALSE; -#endif } @@ -160,16 +156,6 @@ thd_scheduler::~thd_scheduler() { } -void* thd_get_scheduler(THD *thd) -{ - return thd->scheduler.data; -} - -PSI_thread* thd_get_psi(THD *thd) -{ - return thd->scheduler.m_psi; -} - static scheduler_functions *saved_thread_scheduler; static uint saved_thread_handling; diff --git a/sql/sql_class.cc b/sql/sql_class.cc index f2a41bee707..8d00b981533 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -217,6 +217,16 @@ bool foreign_key_prefix(Key *a, Key *b) ** Thread specific functions ****************************************************************************/ +void* thd_get_scheduler(THD *thd) +{ + return thd->scheduler.data; +} + +PSI_thread* thd_get_psi(THD *thd) +{ + return thd->scheduler.m_psi; +} + /* The following functions form part of the C plugin API */ |