From b546212a16a6ac3e9f40f332644345ceec96a0e7 Mon Sep 17 00:00:00 2001
From: "heikki@hundin.mysql.fi" <>
Date: Tue, 13 Aug 2002 23:33:51 +0300
Subject: 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

---
 mysys/my_pthread.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'mysys')

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);
-- 
cgit v1.2.1