diff --git a/include/my_global.h b/include/my_global.h
index eff16d0dfff..746eabcb11e 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -39,6 +39,8 @@
 #undef __WIN__
 #undef __WIN32__
 #define HAVE_ERRNO_AS_DEFINE
+#define _POSIX_MONOTONIC_CLOCK
+#define _POSIX_THREAD_CPUTIME
 #endif /* __CYGWIN__ */
 
 #if defined(__QNXNTO__) && !defined(FD_SETSIZE)
diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c
index cb063e27c1f..268619a1334 100644
--- a/mysys/my_getsystime.c
+++ b/mysys/my_getsystime.c
@@ -28,6 +28,11 @@ static ulonglong query_performance_frequency;
 #include <linux/unistd.h>
 #endif
 
+/* For CYGWIN */
+#if !defined(CLOCK_THREAD_CPUTIME_ID) && defined(CLOCK_THREAD_CPUTIME)
+#define CLOCK_THREAD_CPUTIME_ID CLOCK_THREAD_CPUTIME
+#endif
+
 /*
   return number of nanoseconds since unspecified (but always the same)
   point in the past
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index ac70282c050..f50e9818e74 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -98,8 +98,8 @@ ulong table_lock_wait_timeout;
 enum thr_lock_type thr_upgraded_concurrent_insert_lock = TL_WRITE;
 
 /* The following constants are only for debug output */
-#define MAX_THREADS 100
-#define MAX_LOCKS   100
+#define MAX_THREADS 1000
+#define MAX_LOCKS   1000
 
 
 LIST *thr_lock_thread_list;			/* List of threads in use */