diff options
author | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 21:56:03 +0200 |
---|---|---|
committer | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 21:56:03 +0200 |
commit | 601e6f4b2a78921304bc1d779991c615ee229f89 (patch) | |
tree | 0a9f9390874c91b9e4430fecfbbffa72967e7b69 /server-tools/instance-manager | |
parent | 3d4095603952aca95892d55fb1ef435132de1197 (diff) | |
download | mariadb-git-601e6f4b2a78921304bc1d779991c615ee229f89.tar.gz |
Fixed compiler warnings
Don't assert if my_thread_end() is called twice (common case)
Diffstat (limited to 'server-tools/instance-manager')
-rw-r--r-- | server-tools/instance-manager/guardian.cc | 2 | ||||
-rw-r--r-- | server-tools/instance-manager/portability.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc index 3587a599160..0a037b5b98a 100644 --- a/server-tools/instance-manager/guardian.cc +++ b/server-tools/instance-manager/guardian.cc @@ -222,8 +222,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/portability.h b/server-tools/instance-manager/portability.h index 23a5a5bd14c..7992a06c336 100644 --- a/server-tools/instance-manager/portability.h +++ b/server-tools/instance-manager/portability.h @@ -15,7 +15,6 @@ #define snprintf _snprintf #define SIGKILL 9 -#define SHUT_RDWR 0x2 /*TODO: fix this */ #define PROTOCOL_VERSION 10 |