diff options
| author | heikki@hundin.mysql.fi <> | 2002-08-13 23:33:51 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2002-08-13 23:33:51 +0300 |
| commit | b546212a16a6ac3e9f40f332644345ceec96a0e7 (patch) | |
| tree | a5ffa70f7ded8bc931995f18870b6f3950133daf /mysys | |
| parent | 9dd576c3f84dd6becc52ed5f2be0d1e448ff72b6 (diff) | |
| download | mariadb-git-b546212a16a6ac3e9f40f332644345ceec96a0e7.tar.gz | |
my_pthread.c:
Fix an infinite recursion in my_pthread_mutex_trylock in HP-UX-10.20; the same bug is in the 4.0 tree
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_pthread.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index e4e0eff95e6..4acc9ea7df8 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -435,7 +435,9 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_trylock returns 1 on success, not 0 like pthread_mutex_lock */ - +/* We defined pthread_mutex_trylock as a macro in my_pthread.h, we have + to undef it here to prevent infinite recursion! */ +#undef pthread_mutex_trylock int my_pthread_mutex_trylock(pthread_mutex_t *mutex) { int error=pthread_mutex_trylock(mutex); |