Commit 03658d26 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

Merge sinisa@work.mysql.com:/home/bk/mysql 

into sinisa.nasamreza.org:/mnt/mail/work/mysql
parents f0928187 b3005bf7

mysys/my_pthread.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */