From 662fb20f1e03a5d4146a67b5e73c828f5ab476e4 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.mysql.com>
Date: Wed, 3 Oct 2007 21:38:32 +0200
Subject: [PATCH] Bug#30992 Wrong implementation of pthread_mutex_trylock()
 It's not possible to use WaitForSingleObject to wait on a CRITICAL_SECTION,
 instead use the TryEnterCriticalSection function.  - if "mutex" was already
 taken => return EBUSY  - if "mutex" was aquired => return 0

include/config-win.h:
  Make windows.h define TryEnterCriticalSection
mysys/my_winthread.c:
  Use the TryEnterCriticalSection function to implement pthread_mutex_trylock
  Prevent recursive behaviour by looking at the RecursionCount variable
  in the CRITICAL_SECTION struct and return EBUSY from function if
  the mutex was already locked once.
---
 include/config-win.h |  3 +++
 mysys/my_winthread.c | 22 ++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/include/config-win.h b/include/config-win.h
index 279be7aa5e4..f0804a368bc 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -19,6 +19,9 @@
 /* We have to do this define before including windows.h to get the AWE API
 functions */
 #define _WIN32_WINNT     0x0500
+#else
+/* Get NT 4.0 functions */
+#define _WIN32_WINNT     0x0400
 #endif
 
 #if defined(_MSC_VER) && _MSC_VER >= 1400
diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c
index e9fface0521..e94369bec32 100644
--- a/mysys/my_winthread.c
+++ b/mysys/my_winthread.c
@@ -40,31 +40,29 @@ void win_pthread_init(void)
   pthread_mutex_init(&THR_LOCK_thread,MY_MUTEX_INIT_FAST);
 }
 
+
 /**
    Adapter to @c pthread_mutex_trylock()
 
    @retval 0      Mutex was acquired
    @retval EBUSY  Mutex was already locked by a thread
-   @retval EINVAL Mutex could not be acquired due to other error
  */
 int
 win_pthread_mutex_trylock(pthread_mutex_t *mutex)
 {
-  switch (WaitForSingleObject(mutex, 0)) {
-  case WAIT_TIMEOUT:
-    return EBUSY;
-
-  default:
-  case WAIT_FAILURE:
-    return EINVAL;
-
-  case WAIT_OBJECT_0:
-  case WAIT_ABANDONED: /* The mutex was acquired because it was
-                        * abandoned */
+  if (TryEnterCriticalSection(mutex))
+  {
+    /* Don't allow recursive lock */
+    if (mutex->RecursionCount > 1){
+      LeaveCriticalSection(mutex);
+      return EBUSY;
+    }
     return 0;
   }
+  return EBUSY;
 }
 
+
 /*
 ** We have tried to use '_beginthreadex' instead of '_beginthread' here
 ** but in this case the program leaks about 512 characters for each