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

into sinisa.nasamreza.org:/mnt/mail/work/mysql


mysys/my_pthread.c:
  Auto merged

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 */