Merge 7.2 -> 7.3

Author: Ole John Aske

storage/ndb/ndb_configure.cmake

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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
@@ -179,36 +179,6 @@ HAVE_LINUX_FUTEX)
 OPTION(WITH_NDBMTD
   "Build the MySQL Cluster multithreadded data node" ON)
 
-IF(WITH_NDBMTD)
-  # checking atomic.h needed for spinlock's on sparc and Sun Studio
-  CHECK_INCLUDE_FILES(atomic.h HAVE_ATOMIC_H)
-
-  # checking assembler needed for ndbmtd
-  CHECK_CXX_SOURCE_RUNS("
-  #define HAVE_ATOMIC_H ${HAVE_ATOMIC_H}
-  #include \"${CMAKE_SOURCE_DIR}/storage/ndb/src/kernel/vm/mt-asm.h\"
-  int main()
-  {
-    unsigned int a = 0;
-    volatile unsigned int *ap = (volatile unsigned int*)&a;
-    #ifdef NDB_HAVE_XCNG
-      a = xcng(ap, 1);
-      cpu_pause();
-    #endif
-    mb();
-    * ap = 2;
-    rmb();
-    * ap = 1;
-    wmb();
-    * ap = 0;
-    read_barrier_depends();
-    return a;
-  }"
-  NDB_BUILD_NDBMTD)
-ELSE()
-  SET(NDB_BUILD_NDBMTD CACHE INTERNAL "")
-ENDIF()
-
 SET(WITH_NDB_PORT "" CACHE INTEGER
   "Default port used by MySQL Cluster management server")
 IF(WITH_NDB_PORT GREATER 0)

storage/ndb/src/kernel/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, 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
@@ -47,7 +47,7 @@ SET(NDBD_LIBS ndbblocks ndbkernel ndberror ndbtransport
 )
 
 IF(WIN32)
-  # Add the rseource files for logging to event log
+  # Add the resource files for logging to event log
   SET(NDBD_EXTRA_SRC
     ${CMAKE_SOURCE_DIR}/storage/ndb/src/common/logger/message.rc
     ${CMAKE_SOURCE_DIR}/storage/ndb/src/common/logger/msg00001.bin)
@@ -59,10 +59,8 @@ MYSQL_ADD_EXECUTABLE(ndbd
   COMPONENT ClusterDataNode)
 TARGET_LINK_LIBRARIES(ndbd ${NDBD_LIBS} ndbsched ${LIBDL})
 
-IF(NDB_BUILD_NDBMTD)
-  MYSQL_ADD_EXECUTABLE(ndbmtd
-    main.cpp ndbd.cpp angel.cpp SimBlockList.cpp ${NDBD_EXTRA_SRC}
-    DESTINATION ${INSTALL_SBINDIR}
-    COMPONENT ClusterDataNode)
-  TARGET_LINK_LIBRARIES(ndbmtd ${NDBD_LIBS} ndbsched_mt ${LIBDL})
-ENDIF()
+MYSQL_ADD_EXECUTABLE(ndbmtd
+  main.cpp ndbd.cpp angel.cpp SimBlockList.cpp ${NDBD_EXTRA_SRC}
+  DESTINATION ${INSTALL_SBINDIR}
+  COMPONENT ClusterDataNode)
+TARGET_LINK_LIBRARIES(ndbmtd ${NDBD_LIBS} ndbsched_mt ${LIBDL})

storage/ndb/src/kernel/vm/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, 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
@@ -52,15 +52,13 @@ ADD_CONVENIENCE_LIBRARY(ndbsched
     dummy_nonmt.cpp
 )
 
-IF(NDB_BUILD_NDBMTD)
-  ADD_CONVENIENCE_LIBRARY(ndbsched_mt
-    SimulatedBlock_mt.cpp
-    TransporterCallback_mt.cpp
-    LongSignal_mt.cpp
-    SimplePropertiesSection_mt.cpp
-    mt.cpp
-    dummy_mt.cpp)
-ENDIF()
+ADD_CONVENIENCE_LIBRARY(ndbsched_mt
+  SimulatedBlock_mt.cpp
+  TransporterCallback_mt.cpp
+  LongSignal_mt.cpp
+  SimplePropertiesSection_mt.cpp
+  mt.cpp
+  dummy_mt.cpp)
 
 ADD_CONVENIENCE_LIBRARY(ndbtest
     test_context.cpp
@@ -79,8 +77,6 @@ FOREACH(testprog CountingPool DynArr256 IntrusiveList LHLevel)
                 ndbtransport ndbmgmcommon ndbmgmapi ndbportlib ndbgeneral)
 ENDFOREACH(testprog)
 
-IF(NDB_BUILD_NDBMTD)
-  ADD_EXECUTABLE(mt-send-t mt-send-t.cpp)
-  TARGET_LINK_LIBRARIES(mt-send-t ndbtest ndbkernel ndbsched ndberror
-                 ndbtransport ndbmgmcommon ndbmgmapi ndbportlib ndbgeneral)
-ENDIF()
+ADD_EXECUTABLE(mt-send-t mt-send-t.cpp)
+TARGET_LINK_LIBRARIES(mt-send-t ndbtest ndbkernel ndbsched ndberror
+               ndbtransport ndbmgmcommon ndbmgmapi ndbportlib ndbgeneral)

storage/ndb/src/kernel/vm/mt-asm.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2014, 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
@@ -32,7 +32,7 @@
 /********************
  * GCC
  *******************/
-#if defined(__x86_64__) || defined (__i386__)
+#if defined(__x86_64__) || defined (__i386__) /* 64 or 32 bit x86 */
 
 #define NDB_HAVE_MB
 #define NDB_HAVE_RMB
@@ -114,7 +114,7 @@ extern void cpu_pause();
  * TODO check that asm ("") implies a compiler barrier
  *      i.e that it clobbers memory
  */
-#if defined(__x86_64__)
+#if defined(__x86_64) || defined (__i386) /* 64 or 32 bit x86 */
 #define NDB_HAVE_MB
 #define NDB_HAVE_RMB
 #define NDB_HAVE_WMB
@@ -139,9 +139,10 @@ extern void cpu_pause();
 #define read_barrier_depends()  do {} while(0)
 #else
 #define NDB_NO_ASM "Unsupported architecture (sun studio)"
+#error "Unsupported architecture (sun studio)"
 #endif
 
-#if defined(__x86_64__) || defined(__sparc)
+#if defined(__x86_64) || defined (__i386) || defined(__sparc)
 /**
  * we should probably use assembler for x86 aswell...
  *   but i'm not really sure how you do this in sun-studio :-(
@@ -164,7 +165,7 @@ xcng(volatile unsigned * addr, int val)
   return ret;
 }
 #define cpu_pause()
-#elif defined(__x86_64__)
+#elif defined(__x86_64) || defined (__i386)
 static inline
 int
 xcng(volatile unsigned * addr, int val)