Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

Change-Id: I334f640da2ffc2db6c580fa6dd8e36e69f8912b5

Author: zmur

config.h.cmake

@@ -437,10 +437,6 @@
 #define HAVE_FCNTL_H 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_INTTYPES_H 1
-/* libevent's select.c is not Windows compatible */
-#ifndef _WIN32
-#define HAVE_SELECT 1
-#endif
 #define HAVE_SIGNAL_H 1
 #define HAVE_STDARG_H 1
 #define HAVE_STDINT_H 1

storage/ndb/include/portlib/NdbSleep.h

@@ -27,6 +27,10 @@
 
 #include <ndb_global.h>
 
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
 static inline void NdbSleep_MilliSleep(int milliseconds);
 
 static inline
@@ -80,13 +84,11 @@ void NdbSleep_MilliSleep(int milliseconds)
 {
 #ifdef _WIN32
   Sleep(milliseconds);
-#elif defined(HAVE_SELECT)
+#else
   struct timeval t;
   t.tv_sec =  milliseconds / 1000L;
   t.tv_usec = (milliseconds % 1000L) * 1000L;
   select(0,0,0,0,&t);
-#else
-#error No suitable function found to implement millisecond sleep.
 #endif
 }