From 0accbd0364e0333e0b119aa9ce93e34ded9df6cb Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Mon, 25 Apr 2011 17:22:25 +0200
Subject: lots of post-merge changes

---
 mysys/my_winthread.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mysys/my_winthread.c')

diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c
index 1ca32d58832..19d4a707062 100644
--- a/mysys/my_winthread.c
+++ b/mysys/my_winthread.c
@@ -18,7 +18,7 @@
 *****************************************************************************/
 #if defined (_WIN32)
 /* SAFE_MUTEX will not work until the thread structure is up to date */
-#warning #include <my_global.h>
+
 #undef SAFE_MUTEX
 #include "mysys_priv.h"
 #include <process.h>
-- 
cgit v1.2.1