Merge branch 'mysql-5.6' into mysql-5.7

Conflicts:
	mysys/my_wincond.c

Author: jhauglid

include/thr_cond.h

@@ -1,7 +1,7 @@
 #ifndef THR_COND_INCLUDED
 #define THR_COND_INCLUDED
 
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -86,8 +86,12 @@ static DWORD get_milliseconds(const struct timespec *abstime)
     Convert timespec to millis and subtract current time.
     my_getsystime() returns time in 100 ns units.
   */
-  return (DWORD)(abstime->tv_sec * 1000 + abstime->tv_nsec / 1000000 -
-                 my_getsystime() / 10000);
+  ulonglong future= abstime->tv_sec * 1000 + abstime->tv_nsec / 1000000;
+  ulonglong now= my_getsystime() / 10000;
+  /* Don't allow the timeout to be negative. */
+  if (future < now)
+    return 0;
+  return (DWORD)(future - now);
 #endif
 }
 #endif /* _WIN32 */