diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-05-16 19:00:55 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-05-16 19:00:55 +0300 |
| commit | 4df6586eb712eb968efac9a8ee7dfe5afd4f29db (patch) | |
| tree | d42d701cc65042c2dd9cd84c162e73855d067172 /mysys/my_pthread.c | |
| parent | 74d29a07712a0caf57fca62dacfeb14b110beca4 (diff) | |
| parent | 72ed6bc3974c3c7f112aa9704d073b4bbb86ec35 (diff) | |
| download | mariadb-git-4df6586eb712eb968efac9a8ee7dfe5afd4f29db.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/mail/work/mysql
mysys/my_pthread.c:
Auto merged
Diffstat (limited to 'mysys/my_pthread.c')
| -rw-r--r-- | mysys/my_pthread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 706712086c6..b9b05e21375 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -417,7 +417,7 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond, struct timespec *abstime) { int error=pthread_cond_timedwait(cond,mutex,abstime); - return error == EAGAIN ? ETIMEDOUT : error; + return (error == EAGAIN || error == -1) ? ETIMEDOUT : error; } #endif /* HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT */ |