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 | 926fe68593a0e5aa4b645b88256b695e747be4d0 (patch) | |
| tree | 4085b3e3ca05cd30fe2bc9a1f8feb5e67abcc39b /mysys/my_wincond.c | |
| parent | b29966b04e547c15cec37a37cbd0746524e94f63 (diff) | |
| parent | 33cd911a16f667a1381c5d3de6e526169ba50d1e (diff) | |
| download | mariadb-git-926fe68593a0e5aa4b645b88256b695e747be4d0.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 |