diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 7633a4078ff03eedd52320d9609688a1d811b113..edb7fe6c71eac91b4125b823a02733a8856accb0 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -749,7 +749,6 @@ THD::THD() derived_tables_processing(FALSE), spcont(NULL), m_parser_state(NULL), - skip_wait_timeout(false), #if defined(ENABLED_DEBUG_SYNC) debug_sync_control(0), #endif /* defined(ENABLED_DEBUG_SYNC) */ @@ -769,6 +768,7 @@ THD::THD() scheduler= thread_scheduler; // Will be fixed later event_scheduler.data= 0; event_scheduler.m_psi= 0; + skip_wait_timeout= false; extra_port= 0; catalog= (char*)"std"; // the only catalog we have for now main_security_ctx.init(); diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index cf38929f632cbca2e381693187f4e0ab23110783..4cfb41d5b756e28879a2537ac6440cb4571089ab 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2186,7 +2186,7 @@ static Sys_var_ulong Sys_thread_cache_size( GLOBAL_VAR(thread_cache_size), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 16384), DEFAULT(0), BLOCK_SIZE(1)); - +#ifdef HAVE_POOL_OF_THREADS static bool fix_tp_max_threads(sys_var *, THD *, enum_var_type) { #ifdef _WIN32 @@ -2257,7 +2257,7 @@ static Sys_var_uint Sys_threadpool_max_threads( NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_tp_max_threads) ); - +#endif /* HAVE_POOL_OF_THREADS */ /** Can't change the 'next' tx_isolation if we are already in a