diff options
author | unknown <msvensson@shellback.> | 2006-04-10 18:34:18 +0200 |
---|---|---|
committer | unknown <msvensson@shellback.> | 2006-04-10 18:34:18 +0200 |
commit | f8970214f7611b5c9cc6750747e445668d35991f (patch) | |
tree | 9ef2c729c396d43bda644d4dc4c9da7866de58f1 /server-tools/instance-manager | |
parent | 748b6043f68cbb78ca52b440f4102615e6a05ac0 (diff) | |
download | mariadb-git-f8970214f7611b5c9cc6750747e445668d35991f.tar.gz |
Remove unused variables and label
libmysqld/lib_sql.cc:
Remove unused variable and unused label
server-tools/instance-manager/guardian.cc:
Remove unused variable
server-tools/instance-manager/mysql_connection.cc:
Add cast to avoid warning
sql/ha_partition.cc:
Remove unused variable(s) and an unused label
Diffstat (limited to 'server-tools/instance-manager')
-rw-r--r-- | server-tools/instance-manager/guardian.cc | 2 | ||||
-rw-r--r-- | server-tools/instance-manager/mysql_connection.cc | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc index 7a532263846..3be672cd71c 100644 --- a/server-tools/instance-manager/guardian.cc +++ b/server-tools/instance-manager/guardian.cc @@ -201,8 +201,6 @@ void Guardian_thread::run() while (node != NULL) { - struct timespec timeout; - GUARD_NODE *current_node= (GUARD_NODE *) node->data; instance= ((GUARD_NODE *) node->data)->instance; process_instance(instance, current_node, &guarded_instances, node); diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc index bf39c843f0a..dcd1807701f 100644 --- a/server-tools/instance-manager/mysql_connection.cc +++ b/server-tools/instance-manager/mysql_connection.cc @@ -136,7 +136,7 @@ int Mysql_connection_thread::init() /* Initialize random number generator */ { ulong seed1= (ulong) &rand_st + rand(); - ulong seed2= rand() + time(0); + ulong seed2= (ulong) rand() + time(0); randominit(&rand_st, seed1, seed2); } /* Fill scramble - server's random message used for handshake */ |