mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/mail/work/mysql mysys/my_pthread.c: Auto merged
This commit is contained in:
commit
4df6586eb7
1 changed files with 1 additions and 1 deletions
|
@ -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 */
|
||||
|
||||
|
|
Loading…
Reference in a new issue