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

[magnus.blaudd]

 4105 magnus.blaudd@stripped	2012-11-22 [merge]
      Null merge 7.1(unrm of have_junit.inc) -> 7.2

 4104 magnus.blaudd@stripped	2012-11-22
      ndb
       - disable -Wunused-but-set-variable for now

    modified:
      storage/ndb/CMakeLists.txt
 4103 magnus.blaudd@stripped	2012-11-21 [merge]
      Merge 7.1 -> 7.2

    removed:
      mysql-test/suite/ndb/include/have_junit.inc
    modified:
      mysql-test/suite/ndb/t/clusterj.test
      mysql-test/suite/ndb/t/clusterj_jpa.test
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2012-11-06 12:47:36 +0000
+++ b/storage/ndb/CMakeLists.txt	2012-11-22 07:52:54 +0000
@@ -47,6 +47,7 @@ MACRO(NDB_CHECK_MYSQL_CLUSTER version_st
   ENDIF()
 ENDMACRO()
 
+NDB_CHECK_MYSQL_CLUSTER(${VERSION})
 
 # Temporarily remove -Werror from compiler flags until
 # storage/ndb/ can be built with it
@@ -57,8 +58,15 @@ IF(CMAKE_CXX_FLAGS)
   STRING(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 ENDIF()
 
-
-NDB_CHECK_MYSQL_CLUSTER(${VERSION})
+# Disable specific types of warnings for storage/ndb
+# NOTE! gcc allow -Wno-<warning> also for unrecognized
+# options, thus safe for older compiler versions
+IF(CMAKE_COMPILER_IS_GNUCXX)
+  FOREACH(warning "unused-but-set-variable")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-${warning}")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-${warning}")
+  ENDFOREACH()
+ENDIF()
 
 #
 # Add the ndbcluster plugin

No bundle (reason: useless for push emails).