diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-19 11:10:06 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-19 11:10:06 +0300 |
| commit | 1a905ce2440093117722aa25c0c88769318721a1 (patch) | |
| tree | 7d6cac7d6357418f6b85ae82dcdb0e7532fca077 /mysys/my_pthread.c | |
| parent | 387e77d104887d45a4574a9bd1b826cfa20f01c1 (diff) | |
| parent | 8a32ef1cf9e3d92230416b882b697aeb8867278c (diff) | |
| download | mariadb-git-1a905ce2440093117722aa25c0c88769318721a1.tar.gz | |
merge
Docs/glibc-2.2.5.patch:
Auto merged
Docs/manual.texi:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'mysys/my_pthread.c')
| -rw-r--r-- | mysys/my_pthread.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 0ac35123ad0..747a07e71b2 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -432,6 +432,7 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, } #endif + #ifdef HPUX int my_pthread_mutex_trylock(pthread_mutex_t *mutex) { |