diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-20 15:23:19 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-20 15:23:19 +0300 |
| commit | db2032fd7311c01e6f9d795a64be7144cf4b0a69 (patch) | |
| tree | 0ac942b1ae284719fe61fa8f32e996530ee79f3f /mysys/my_pthread.c | |
| parent | df2c241ddb59f887d91e49ab80880f6421ff4116 (diff) | |
| parent | 733d8837609f43e2453b6cb19aba45287c89700b (diff) | |
| download | mariadb-git-db2032fd7311c01e6f9d795a64be7144cf4b0a69.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
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) { |