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

BUG#24687 func_misc test fails on win64

Browse Source 
- Use same precision (milliseconds) for all time functions
   used  when calculating time for pthread_cond_timedwait
 - Use 'GetSystemTimeAsFileTime' for both start and curr time
This commit is contained in:
msvensson@shellback.
2006-12-14 15:23:44 +01:00
parent fdbc84d27c
commit c41e307d85
6 changed files with 96 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -476,10 +476,9 @@ int Instance::stop()
waitchild= options.shutdown_delay_val;
kill_instance(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;