diff options
author | monty@hundin.mysql.fi <> | 2001-12-20 06:14:11 +0200 |
---|---|---|
committer | monty@hundin.mysql.fi <> | 2001-12-20 06:14:11 +0200 |
commit | 0eb46e425619c44ccb286a40e0d7fda0498192cd (patch) | |
tree | 6238391b82cf68076a5dea6dd2e3c8c5c27473cd /mysys/my_pthread.c | |
parent | b1291364cbf3cd93ba1ad3b8397e30ee85321d93 (diff) | |
download | mariadb-git-0eb46e425619c44ccb286a40e0d7fda0498192cd.tar.gz |
Fix insert delated + query cache.
Fix pthread_mutex_trylock on HPUX (needed for query cache).
Diffstat (limited to 'mysys/my_pthread.c')
-rw-r--r-- | mysys/my_pthread.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 161e4faaff6..37c18a32451 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -471,6 +471,8 @@ struct hostent *my_gethostbyname_r(const char *name, this has to be added here. *****************************************************************************/ +#ifdef HPUX + int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, struct timespec *abstime) { @@ -483,6 +485,18 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, } +int my_pthread_mutex_trylock(pthread_mutex_t *mutex) +{ + int error=pthread_mutex_trylock(mutex); + if (error == 1) /* Safety if the lib is fixed */ + return 0; /* Mutex was locked */ + if (error == -1) /* Safety if the lib is fixed */ + error=errno; + return error; +} + +#endif + /* Some help functions */ int pthread_no_free(void *not_used __attribute__((unused))) |