summaryrefslogtreecommitdiff
path: root/server-tools
diff options
context:
space:
mode:
authormonty@mysql.com/narttu.mysql.fi <>2007-02-22 16:59:57 +0200
committermonty@mysql.com/narttu.mysql.fi <>2007-02-22 16:59:57 +0200
commite5cc397f33e6c9916043742194bbdc809e118905 (patch)
tree260c15e9d6f383c404ea95e9e68ef07f0eba2cea /server-tools
parent6946fa682fd6b0f90f17f1bd2bf1bdc9579c0fca (diff)
downloadmariadb-git-e5cc397f33e6c9916043742194bbdc809e118905.tar.gz
Fixed compiler warnings (for linux and win32 and win64)
Fixed a couple of usage of not initialized warnings (unlikely cases)
Diffstat (limited to 'server-tools')
-rw-r--r--server-tools/instance-manager/mysql_connection.cc2
-rw-r--r--server-tools/instance-manager/mysqlmanager.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc
index 32618a6cdd6..3e1694e24ee 100644
--- a/server-tools/instance-manager/mysql_connection.cc
+++ b/server-tools/instance-manager/mysql_connection.cc
@@ -135,7 +135,7 @@ int Mysql_connection_thread::init()
/* Initialize random number generator */
{
ulong seed1= (ulong) &rand_st + rand();
- ulong seed2= rand() + time(0);
+ ulong seed2= rand() + (ulong) time(0);
randominit(&rand_st, seed1, seed2);
}
/* Fill scramble - server's random message used for handshake */
diff --git a/server-tools/instance-manager/mysqlmanager.cc b/server-tools/instance-manager/mysqlmanager.cc
index 2b6921d59aa..66fc0b68ac4 100644
--- a/server-tools/instance-manager/mysqlmanager.cc
+++ b/server-tools/instance-manager/mysqlmanager.cc
@@ -199,7 +199,7 @@ static void init_environment(char *progname)
MY_INIT(progname);
log_init();
umask(0117);
- srand(time(0));
+ srand((uint) time(0));
}