summaryrefslogtreecommitdiff
path: root/mysys/my_pthread.c
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-08-08 03:14:44 +0300
committermonty@hundin.mysql.fi <>2002-08-08 03:14:44 +0300
commita31406e34e238386940c90196eb570a6a4d97616 (patch)
treee700bcb0baacd3c2e36818839eb18c8744ddf5dd /mysys/my_pthread.c
parent40f8e028314b818a8da8ce624f744114ca92743d (diff)
downloadmariadb-git-a31406e34e238386940c90196eb570a6a4d97616.tar.gz
Fix for Intel compiler (ecc)
Minor cleanups to other patches. Make --temp-pool default
Diffstat (limited to 'mysys/my_pthread.c')
-rw-r--r--mysys/my_pthread.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index 38451f1f79a..cb37fe7c73f 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -438,6 +438,12 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
#ifdef HPUX
+/*
+ In HP-UX-10.20 and other old Posix 1003.4a Draft 4 implementations
+ pthread_mutex_trylock returns 1 on success, not 0 like
+ pthread_mutex_lock
+*/
+
int my_pthread_mutex_trylock(pthread_mutex_t *mutex)
{
int error=pthread_mutex_trylock(mutex);
@@ -447,9 +453,9 @@ int my_pthread_mutex_trylock(pthread_mutex_t *mutex)
error=errno;
return error;
}
-
#endif
+
/* Some help functions */
int pthread_no_free(void *not_used __attribute__((unused)))