database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge siva.hindu.god:/usr/home/tim/m/bk/50

Browse Source 
into  siva.hindu.god:/usr/home/tim/m/bk/51
This commit is contained in:
tsmith/tim@siva.hindu.god
2006-12-14 12:56:57 -07:00
parent f8ac527b73 b19b9333f0
commit 126f004a7f
8 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server-tools/instance-manager/guardian.cc
View File

@@ -254,9 +254,8 @@ void Guardian::run()
node= node->next;
}
timeout.tv_sec= time(NULL) + monitoring_interval;
timeout.tv_nsec= 0;
set_timespec(timeout, monitoring_interval);
/* check the loop predicate before sleeping */
if (!(shutdown_requested && (!(guarded_instances))))
thread_registry->cond_timedwait(&thread_info, &COND_guardian,

5
server-tools/instance-manager/instance.cc
View File

@@ -636,10 +636,9 @@ int Instance::stop()
waitchild= options.get_shutdown_delay();
kill_mysqld(SIGTERM);
/* sleep on condition to wait for SIGCHLD */
timeout.tv_sec= time(NULL) + waitchild;
timeout.tv_nsec= 0;
/* sleep on condition to wait for SIGCHLD */
set_timespec(timeout, waitchild);
if (pthread_mutex_lock(&LOCK_instance))
return ER_STOP_INSTANCE;