diff options
| author | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2009-10-06 09:40:30 +0200 |
|---|---|---|
| committer | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2009-10-06 09:40:30 +0200 |
| commit | 499121a080f483c8d6daef10ff023aaf5f874bd2 (patch) | |
| tree | 4085b3e3ca05cd30fe2bc9a1f8feb5e67abcc39b /mysys/my_wincond.c | |
| parent | 70891edd19c8a14663c01af134ebfafea9fb56c1 (diff) | |
| parent | 2b78dbff54d94cd02bdf31f4d52cd3e1823a4fe7 (diff) | |
| download | mariadb-git-499121a080f483c8d6daef10ff023aaf5f874bd2.tar.gz | |
Automerg
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 d1b07b61408..1134d40229a 100644 --- a/mysys/my_wincond.c +++ b/mysys/my_wincond.c @@ -120,13 +120,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 |