diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-08 12:05:18 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-08 12:05:18 +0300 |
| commit | ca1875f54033c5ea067ec3ec07b00375de6975d7 (patch) | |
| tree | e4fd56548f8b7114557c187ad8aa70c1c5c26d52 /mysys | |
| parent | a6b15fdd7682bffc2e197ac50e21332bb9bcf297 (diff) | |
| parent | a9c47d8cfc9d93dd93409c3d3681a4f726a456e5 (diff) | |
| download | mariadb-git-ca1875f54033c5ea067ec3ec07b00375de6975d7.tar.gz | |
merge
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_pthread.c | 8 | ||||
| -rw-r--r-- | mysys/my_semaphore.c | 1 |
2 files changed, 8 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))) diff --git a/mysys/my_semaphore.c b/mysys/my_semaphore.c index de4aac1cdbd..2dd224cd99e 100644 --- a/mysys/my_semaphore.c +++ b/mysys/my_semaphore.c @@ -21,6 +21,7 @@ #include <my_global.h> #include <my_semaphore.h> +#include <errno.h> #if !defined(__WIN__) && !defined(HAVE_SEMAPHORE_H) |