Commit c01fc2ab authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

fix embedded build and warning

parent 305ae953
...@@ -749,7 +749,6 @@ THD::THD() ...@@ -749,7 +749,6 @@ THD::THD()
derived_tables_processing(FALSE), derived_tables_processing(FALSE),
spcont(NULL), spcont(NULL),
m_parser_state(NULL), m_parser_state(NULL),
skip_wait_timeout(false),
#if defined(ENABLED_DEBUG_SYNC) #if defined(ENABLED_DEBUG_SYNC)
debug_sync_control(0), debug_sync_control(0),
#endif /* defined(ENABLED_DEBUG_SYNC) */ #endif /* defined(ENABLED_DEBUG_SYNC) */
...@@ -769,6 +768,7 @@ THD::THD() ...@@ -769,6 +768,7 @@ THD::THD()
scheduler= thread_scheduler; // Will be fixed later scheduler= thread_scheduler; // Will be fixed later
event_scheduler.data= 0; event_scheduler.data= 0;
event_scheduler.m_psi= 0; event_scheduler.m_psi= 0;
skip_wait_timeout= false;
extra_port= 0; extra_port= 0;
catalog= (char*)"std"; // the only catalog we have for now catalog= (char*)"std"; // the only catalog we have for now
main_security_ctx.init(); main_security_ctx.init();
......
...@@ -2186,7 +2186,7 @@ static Sys_var_ulong Sys_thread_cache_size( ...@@ -2186,7 +2186,7 @@ static Sys_var_ulong Sys_thread_cache_size(
GLOBAL_VAR(thread_cache_size), CMD_LINE(REQUIRED_ARG), GLOBAL_VAR(thread_cache_size), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(0, 16384), DEFAULT(0), BLOCK_SIZE(1)); 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) static bool fix_tp_max_threads(sys_var *, THD *, enum_var_type)
{ {
#ifdef _WIN32 #ifdef _WIN32
...@@ -2257,7 +2257,7 @@ static Sys_var_uint Sys_threadpool_max_threads( ...@@ -2257,7 +2257,7 @@ static Sys_var_uint Sys_threadpool_max_threads(
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_tp_max_threads) ON_UPDATE(fix_tp_max_threads)
); );
#endif /* HAVE_POOL_OF_THREADS */
/** /**
Can't change the 'next' tx_isolation if we are already in a Can't change the 'next' tx_isolation if we are already in a
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment