diff options
| author | unknown <petr@mysql.com> | 2004-12-22 01:00:29 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2004-12-22 01:00:29 +0300 |
| commit | 8b80b584885ba68e8884704d608a05dfb3611062 (patch) | |
| tree | 93789a27542cac6548f7cf66cefb9c7537073c16 /server-tools/instance-manager/thread_registry.cc | |
| parent | 2aa5d925373576715d6cd13d61dd0162ea59a937 (diff) | |
| download | mariadb-git-8b80b584885ba68e8884704d608a05dfb3611062.tar.gz | |
Bug #7468 Instance Manager fails to compile: thread_registry.cc
This fix icludes workaround for Irix compiler bug & removs some unused
variables (resulted in warnings)
server-tools/instance-manager/mysql_connection.cc:
removed unused variable
server-tools/instance-manager/parse.cc:
removed unused variable
server-tools/instance-manager/thread_registry.cc:
Workaround for the Irix compiler bug
server-tools/instance-manager/user_map.cc:
removed unused variable
Diffstat (limited to 'server-tools/instance-manager/thread_registry.cc')
| -rw-r--r-- | server-tools/instance-manager/thread_registry.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server-tools/instance-manager/thread_registry.cc b/server-tools/instance-manager/thread_registry.cc index 4037da71880..d0bf51f3d61 100644 --- a/server-tools/instance-manager/thread_registry.cc +++ b/server-tools/instance-manager/thread_registry.cc @@ -148,6 +148,7 @@ int Thread_registry::cond_wait(Thread_info *info, pthread_cond_t *cond, void Thread_registry::deliver_shutdown() { + Thread_info *info; struct timespec shutdown_time; set_timespec(shutdown_time, 1); @@ -161,7 +162,7 @@ void Thread_registry::deliver_shutdown() stopped alarm processing. */ process_alarm(THR_SERVER_ALARM); - for (Thread_info *info= head.next; info != &head; info= info->next) + for (info= head.next; info != &head; info= info->next) { pthread_kill(info->thread_id, THREAD_KICK_OFF_SIGNAL); /* @@ -190,7 +191,7 @@ void Thread_registry::deliver_shutdown() so this time everybody should be informed (presumably each worker can get CPU during shutdown_time.) */ - for (Thread_info *info= head.next; info != &head; info= info->next) + for (info= head.next; info != &head; info= info->next) { pthread_kill(info->thread_id, THREAD_KICK_OFF_SIGNAL); if (info->current_cond) |