diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-14 11:17:49 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-14 11:17:49 +0400 |
| commit | 32e51de7f58d6f3e82c97fe9ab37d8d8246b762b (patch) | |
| tree | 739b359b49861a33a973f709d1dd17a9a26abc1d /mysys | |
| parent | 12a4c67b2219faa05b3064cd709dafec58a0971b (diff) | |
| parent | 0e8c86f4263be0ae55607437c7276721de6a8fe9 (diff) | |
| download | mariadb-git-32e51de7f58d6f3e82c97fe9ab37d8d8246b762b.tar.gz | |
Merge from mysql-5.1.
Diffstat (limited to 'mysys')
| -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 |