diff options
Diffstat (limited to 'server-tools/instance-manager')
-rw-r--r-- | server-tools/instance-manager/guardian.cc | 4 | ||||
-rw-r--r-- | server-tools/instance-manager/instance.cc | 2 | ||||
-rw-r--r-- | server-tools/instance-manager/mysql_connection.cc | 2 | ||||
-rw-r--r-- | server-tools/instance-manager/mysqlmanager.cc | 2 |
4 files changed, 5 insertions, 5 deletions
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)); } |