mirror of
https://github.com/MariaDB/server.git
synced 2026-05-10 00:54:30 +02:00
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
This commit is contained in:
parent
2aa5d92537
commit
8b80b58488
4 changed files with 3 additions and 5 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue