bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4106 to 4108)

[magnus.blaudd]

 4108 magnus.blaudd@stripped	2012-11-22
      my_attribute.h is self contained in 5.5 based, no need ot include my_global.h

    modified:
      storage/ndb/include/ndbapi/Ndb.hpp
 4107 magnus.blaudd@stripped	2012-11-22 [merge]
      Merge

    modified:
      storage/ndb/CMakeLists.txt
 4106 Mauritz Sundell	2012-11-22 [merge]
      merge 7.1 -> 7.2

    modified:
      storage/ndb/include/ndbapi/Ndb.hpp
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2012-11-22 07:52:54 +0000
+++ b/storage/ndb/CMakeLists.txt	2012-11-22 09:57:12 +0000
@@ -59,12 +59,16 @@ IF(CMAKE_CXX_FLAGS)
 ENDIF()
 
 # Disable specific types of warnings for storage/ndb
-# NOTE! gcc allow -Wno-<warning> also for unrecognized
-# options, thus safe for older compiler versions
+# if the compiler supports the flag
 IF(CMAKE_COMPILER_IS_GNUCXX)
+  INCLUDE(CheckCXXCompilerFlag)
   FOREACH(warning "unused-but-set-variable")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-${warning}")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-${warning}")
+    CHECK_CXX_COMPILER_FLAG("-Wno-${warning}" flag_supported)
+    IF(flag_supported)
+      MESSAGE(STATUS "Disabling -W${warning} warning")
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-${warning}")
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-${warning}")
+    ENDIF()
   ENDFOREACH()
 ENDIF()
 

=== modified file 'storage/ndb/include/ndbapi/Ndb.hpp'
--- a/storage/ndb/include/ndbapi/Ndb.hpp	2012-11-22 09:49:26 +0000
+++ b/storage/ndb/include/ndbapi/Ndb.hpp	2012-11-22 10:19:22 +0000
@@ -2064,11 +2064,6 @@ private:
 #endif
 
 #ifdef VM_TRACE
-/**
- * my_attribute.h need GCC_VERSION defined from my_global.h,
- * otherwise it will redefine __attribute__
- */
-#include <my_global.h>
 #include <my_attribute.h>
   void printState(const char* fmt, ...)
     ATTRIBUTE_FORMAT(printf, 2, 3);

No bundle (reason: useless for push emails).