Merge nocona:/data0/msvensson/mysql-5.0-maint

into  shellback.:C:/mysql/mysql-5.0-maint

1 files changed, 22 insertions, 6 deletions

diff --git a/mysys/my_wincond.c b/mysys/my_wincond.c
index 8c497e8f250..327addff2cc 100644
--- a/mysys/my_wincond.c
+++ b/mysys/my_wincond.c
@@ -54,14 +54,30 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
 int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
                            struct timespec *abstime)
 {
-  struct _timeb curtime;
   int result;
-  long timeout;
-  _ftime(&curtime);
-  timeout= ((long) (abstime->tv_sec - curtime.time)*1000L +
-		    (long)((abstime->tv_nsec/1000) - curtime.millitm)/1000L);
-  if (timeout < 0)				/* Some safety */
+  long timeout; 
+  union ft64 now;
+  
+  GetSystemTimeAsFileTime(&now.ft);
+
+  /*
+    - subtract start time from current time(values are in 100ns units
+    - convert to millisec by dividing with 10000
+    - subtract time since start from max timeout
+  */
+  timeout= abstime->timeout_msec - (long)((now.i64 - abstime->start.i64) / 10000);
+  
+  /* Don't allow the timeout to be negative */
+  if (timeout < 0)
     timeout = 0L;
+
+  /*
+    Make sure the calucated time does not exceed original timeout
+    value which could cause "wait for ever" if system time changes
+  */
+  if (timeout > abstime->timeout_msec)
+    timeout= abstime->timeout_msec;
+
   InterlockedIncrement(&cond->waiting);
   LeaveCriticalSection(mutex);
   result=WaitForSingleObject(cond->semaphore,timeout);