From: magnus.blaudd
Date: July 1 2011 5:35am
Subject: bzr push into mysql-5.5-cluster branch (magnus.blaudd:3406 to 3408)
List-Archive: http://lists.mysql.com/commits/140100
Message-Id: <20110701053523.E04DF13402B@pilot>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3408 magnus.blaudd@stripped	2011-07-01
      ndb
       - Only call replace on CXXFLAGS and CFLAGS if they are set

    modified:
      storage/ndb/CMakeLists.txt
 3407 magnus.blaudd@stripped	2011-07-01
      Bug #12713957 	ALWAYS UWSING -WALL WITG GCC, NO WAY TO OVERRIDE
       - turn off the automatic turn on

    modified:
      configure.cmake
 3406 jonas oreland	2011-06-30
      ndb - compile-cluster - allow 0 or more argument to "--with-debug" still meaning debug=1

    modified:
      storage/ndb/compile-cluster
=== modified file 'configure.cmake'
--- a/configure.cmake	2011-06-30 15:06:25 +0000
+++ b/configure.cmake	2011-07-01 05:32:24 +0000
@@ -54,6 +54,7 @@ IF(NOT SYSTEM_TYPE)
 ENDIF()
 
 
+IF(MCP_BUG12713957)
 # Always enable -Wall for gnu C/C++
 IF(CMAKE_COMPILER_IS_GNUCXX)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-parameter")
@@ -61,6 +62,7 @@ ENDIF()
 IF(CMAKE_COMPILER_IS_GNUCC)
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 ENDIF()
+ENDIF(MCP_BUG12713957)
 
 
 IF(CMAKE_COMPILER_IS_GNUCXX)

=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2011-06-30 12:19:14 +0000
+++ b/storage/ndb/CMakeLists.txt	2011-07-01 05:34:37 +0000
@@ -57,8 +57,12 @@ ENDMACRO()
 
 # Temporarily remove -Werror from compiler flags until
 # storage/ndb/ can be built with it
-STRING(REPLACE "-Werror" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
-STRING(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+IF(CMAKE_C_FLAGS)
+  STRING(REPLACE "-Werror" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
+ENDIF()
+IF(CMAKE_CXX_FLAGS)
+  STRING(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ENDIF()
 
 IF (MYSQL_VERSION_ID LESS 50500)
   # Use same compiler defines as MySQL Server for debug compile

No bundle (reason: useless for push emails).