diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-27 12:20:06 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-27 12:20:06 +0100 |
| commit | c01fc2abc7820ec372c2f678474912196f49d983 (patch) | |
| tree | 44af70139ef6a3de68deee42119085732c3fbc48 | |
| parent | 305ae953db50075aa735a444464ef7086e7ad6fb (diff) | |
| download | mariadb-git-c01fc2abc7820ec372c2f678474912196f49d983.tar.gz | |
fix embedded build and warning
| -rw-r--r-- | sql/sql_class.cc | 2 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 7633a4078ff..edb7fe6c71e 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 cf38929f632..4cfb41d5b75 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 |