summaryrefslogtreecommitdiff
path: root/mysys/my_pthread.c
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-06-16 17:06:12 +0300
committerunknown <monty@mashka.mysql.fi>2002-06-16 17:06:12 +0300
commit8a8e4be22f0806e2a606659de7b6c9069f4ef2e4 (patch)
tree5f06cb07df859c884eed35668ba450e5060ab52a /mysys/my_pthread.c
parentc554eeec98958fd77dfedf18fc7c5cfd58cf046b (diff)
downloadmariadb-git-8a8e4be22f0806e2a606659de7b6c9069f4ef2e4.tar.gz
Cleanup of checking of user resources
Added missing checking of no_keyread Docs/manual.texi: Fixed wrong example myisam/myisamchk.c: Removed not needed include file mysys/my_pthread.c: Fix for HPUX mysys/my_thr_init.c: Removed not needed warning scripts/mysql_fix_privilege_tables.sh: Cleanup sql/sql_lex.cc: Removed not needed initialization sql/sql_parse.cc: Cleanup of checking of user resources sql/sql_select.cc: Added checking of no_keyread
Diffstat (limited to 'mysys/my_pthread.c')
-rw-r--r--mysys/my_pthread.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index e1345b96627..38451f1f79a 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -426,9 +426,12 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
{
int error=pthread_cond_timedwait(cond, mutex, abstime);
if (error == -1) /* Safety if the lib is fixed */
- error=errno;
+ {
+ if (!(error=errno))
+ error= ETIMEDOUT; /* Can happen on HPUX */
+ }
if (error == EAGAIN) /* Correct errno to Posix */
- error=ETIMEDOUT;
+ error= ETIMEDOUT;
return error;
}
#endif