mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Fixed compiler warnings
Fixed compile-pentium64 scripts Fixed wrong estimate of update_with_key_prefix in sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 Fixed unsafe define of uint4korr() Fixed that --extern works with mysql-test-run.pl Small trivial cleanups This also fixes a bug in counting number of rows that are updated when we have many simultanous queries Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc Split handle_one_connection() into reusable sub functions. Split create_new_thread() into reusable sub functions. Added thread_scheduler; Preliminary interface code for future thread_handling code. Use 'my_thread_id' for internal thread id's Make thr_alarm_kill() to depend on thread_id instead of thread Make thr_abort_locks_for_thread() depend on thread_id instead of thread In store_globals(), set my_thread_var->id to be thd->thread_id. Use my_thread_var->id as basis for my_thread_name() The above changes makes the connection we have between THD and threads more soft. Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions Fixed compiler warnings Fixed core dumps when running with --debug Removed setting of signal masks (was never used) Made event code call pthread_exit() (portability fix) Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called. Made handling of thread_id and thd->variables.pseudo_thread_id uniform. Removed one common 'not freed memory' warning from mysqltest Fixed a couple of usage of not initialized warnings (unlikely cases) Suppress compiler warnings from bdb and (for the moment) warnings from ndb
This commit is contained in:
@@ -396,6 +396,10 @@ sys_var_thd_ulong sys_trans_alloc_block_size("transaction_alloc_block_size",
|
||||
sys_var_thd_ulong sys_trans_prealloc_size("transaction_prealloc_size",
|
||||
&SV::trans_prealloc_size,
|
||||
0, fix_trans_mem_root);
|
||||
sys_var_thd_enum sys_thread_handling("thread_handling",
|
||||
&SV::thread_handling,
|
||||
&thread_handling_typelib,
|
||||
NULL);
|
||||
|
||||
#ifdef HAVE_QUERY_CACHE
|
||||
sys_var_long_ptr sys_query_cache_limit("query_cache_limit",
|
||||
@@ -464,6 +468,10 @@ sys_var_long_ptr sys_table_lock_wait_timeout("table_lock_wait_timeout",
|
||||
&table_lock_wait_timeout);
|
||||
sys_var_long_ptr sys_thread_cache_size("thread_cache_size",
|
||||
&thread_cache_size);
|
||||
#if HAVE_POOL_OF_THREADS == 1
|
||||
sys_var_long_ptr sys_thread_pool_size("thread_pool_size",
|
||||
&thread_pool_size);
|
||||
#endif
|
||||
sys_var_thd_enum sys_tx_isolation("tx_isolation",
|
||||
&SV::tx_isolation,
|
||||
&tx_isolation_typelib,
|
||||
@@ -1006,6 +1014,10 @@ SHOW_VAR init_vars[]= {
|
||||
{sys_thread_cache_size.name,(char*) &sys_thread_cache_size, SHOW_SYS},
|
||||
#ifdef HAVE_THR_SETCONCURRENCY
|
||||
{"thread_concurrency", (char*) &concurrency, SHOW_LONG},
|
||||
#endif
|
||||
{sys_thread_handling.name, (char*) &sys_thread_handling, SHOW_SYS},
|
||||
#if HAVE_POOL_OF_THREADS == 1
|
||||
{sys_thread_pool_size.name, (char*) &sys_thread_pool_size, SHOW_SYS},
|
||||
#endif
|
||||
{"thread_stack", (char*) &thread_stack, SHOW_LONG},
|
||||
{sys_time_format.name, (char*) &sys_time_format, SHOW_SYS},
|
||||
@@ -2587,7 +2599,7 @@ bool update_sys_var_str_path(THD *thd, sys_var_str *var_str,
|
||||
file_log= logger.get_log_file_handler();
|
||||
break;
|
||||
default:
|
||||
DBUG_ASSERT(0);
|
||||
assert(0); // Impossible
|
||||
}
|
||||
|
||||
if (!old_value)
|
||||
@@ -3626,7 +3638,7 @@ bool sys_var_thd_table_type::update(THD *thd, set_var *var)
|
||||
*/
|
||||
|
||||
byte *sys_var_thd_sql_mode::symbolic_mode_representation(THD *thd,
|
||||
ulong val,
|
||||
ulonglong val,
|
||||
ulong *len)
|
||||
{
|
||||
char buff[256];
|
||||
@@ -4002,7 +4014,7 @@ sys_var_event_scheduler::update(THD *thd, set_var *var)
|
||||
res= Events::get_instance()->stop_execution_of_events();
|
||||
else
|
||||
{
|
||||
DBUG_ASSERT(0);
|
||||
assert(0); // Impossible
|
||||
}
|
||||
if (res)
|
||||
my_error(ER_EVENT_SET_VAR_ERROR, MYF(0));
|
||||
|
Reference in New Issue
Block a user