From f0ae3ce9b97f45b717201764c6af6e4bd4176e5c Mon Sep 17 00:00:00 2001 From: "monty@mysql.com/narttu.mysql.fi" <> Date: Fri, 23 Feb 2007 13:13:55 +0200 Subject: 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 --- server-tools/instance-manager/guardian.cc | 4 ++-- server-tools/instance-manager/instance.cc | 2 +- server-tools/instance-manager/mysql_connection.cc | 2 +- server-tools/instance-manager/mysqlmanager.cc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'server-tools') diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc index 9a5ae090300..e114496248e 100644 --- a/server-tools/instance-manager/guardian.cc +++ b/server-tools/instance-manager/guardian.cc @@ -212,8 +212,8 @@ void Guardian::process_instance(Instance *instance) return; case Instance::CRASHED: /* just regular restarts */ - if (current_time - instance->last_checked <= - Options::Main::monitoring_interval) + if ((ulong) (current_time - instance->last_checked) <= + (ulong) Options::Main::monitoring_interval) return; if (instance->restart_counter < restart_retry) diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc index 31e060e27fe..edc9c88fe9f 100644 --- a/server-tools/instance-manager/instance.cc +++ b/server-tools/instance-manager/instance.cc @@ -923,7 +923,7 @@ void Instance::remove_pid() bool Instance::wait_for_stop() { - int start_time= time(NULL); + int start_time= (int) time(NULL); int finish_time= start_time + options.get_shutdown_delay(); log_info("Instance '%s': waiting for mysqld to stop " diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc index 8afa7fdc744..293d90420b1 100644 --- a/server-tools/instance-manager/mysql_connection.cc +++ b/server-tools/instance-manager/mysql_connection.cc @@ -87,7 +87,7 @@ bool Mysql_connection::init() /* Initialize random number generator */ { ulong seed1= (ulong) &rand_st + rand(); - ulong seed2= (ulong) rand() + time(0); + ulong seed2= (ulong) rand() + (ulong) time(0); randominit(&rand_st, seed1, seed2); } diff --git a/server-tools/instance-manager/mysqlmanager.cc b/server-tools/instance-manager/mysqlmanager.cc index 27f0e555fcb..225861037dd 100644 --- a/server-tools/instance-manager/mysqlmanager.cc +++ b/server-tools/instance-manager/mysqlmanager.cc @@ -225,7 +225,7 @@ static void init_environment(char *progname) MY_INIT(progname); log_init(); umask(0117); - srand((unsigned int) time(0)); + srand((uint) time(0)); } -- cgit v1.2.1