bzr commit into mysql-5.1-telco-6.4 branch (jonas:2690)

[jonas]

#At file:///home/jonas/src/telco-6.4/

 2690 jonas@stripped	2008-08-04
      ndb (mt)
         Fix so that futexes are used even if kernel headers are <= 2.6.17
         - use constants for futexes instead of include file, "ugly" but works
modified:
  configure.in
  storage/ndb/src/kernel/vm/mt.cpp

=== modified file 'configure.in'
--- a/configure.in	2008-06-09 14:32:01 +0000
+++ b/configure.in	2008-08-04 09:11:28 +0000
@@ -2397,9 +2397,14 @@ AC_TRY_LINK(
    #endif
    #include <sys/types.h>
    #include <unistd.h>
-   #include <linux/futex.h>
    #include <errno.h>
    #include <sys/syscall.h>],
+   #define FUTEX_WAIT        0
+   #define FUTEX_WAKE        1
+   #define FUTEX_FD          2
+   #define FUTEX_REQUEUE     3
+   #define FUTEX_CMP_REQUEUE 4
+   #define FUTEX_WAKE_OP     5
   [
    int a = 0; int * addr = &a;
    return syscall(SYS_futex, addr, FUTEX_WAKE, 1, 0, 0, 0) == 0 ? 0 : errno;

=== modified file 'storage/ndb/src/kernel/vm/mt.cpp'
--- a/storage/ndb/src/kernel/vm/mt.cpp	2008-08-04 09:04:33 +0000
+++ b/storage/ndb/src/kernel/vm/mt.cpp	2008-08-04 09:11:28 +0000
@@ -94,7 +94,13 @@ cpu_pause()
 #include <unistd.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
-#include <linux/futex.h>
+
+#define FUTEX_WAIT              0
+#define FUTEX_WAKE              1
+#define FUTEX_FD                2
+#define FUTEX_REQUEUE           3
+#define FUTEX_CMP_REQUEUE       4
+#define FUTEX_WAKE_OP           5
 
 static inline
 int