diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
| commit | ca08f10ccd20213ad2ac1fa19f19cd7dfbcc5d7d (patch) | |
| tree | 1b3260f72106f50b182546dff41127a389144fa1 /mysys/my_wincond.c | |
| parent | 946dc457facc58517e9c47f1c5ad0029e529da79 (diff) | |
| parent | 32e51de7f58d6f3e82c97fe9ab37d8d8246b762b (diff) | |
| download | mariadb-git-ca08f10ccd20213ad2ac1fa19f19cd7dfbcc5d7d.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'mysys/my_wincond.c')
| -rw-r--r-- | mysys/my_wincond.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysys/my_wincond.c b/mysys/my_wincond.c index 956d29a970b..e7d8073a163 100644 --- a/mysys/my_wincond.c +++ b/mysys/my_wincond.c @@ -119,13 +119,12 @@ int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, LeaveCriticalSection(&cond->lock_waiting); LeaveCriticalSection(mutex); - result= WaitForMultipleObjects(2, cond->events, FALSE, timeout); EnterCriticalSection(&cond->lock_waiting); cond->waiting--; - if (cond->waiting == 0 && result == (WAIT_OBJECT_0+BROADCAST)) + if (cond->waiting == 0) { /* We're the last waiter to be notified or to stop waiting, so |