bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4257)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:ole.john.aske@stripped

 4257 Magnus Blåudd	2011-03-28
      ndb cmake 
       - Temporarily remove -Werror from compiler flags
         until storage/ndb/ can be built with it

    modified:
      storage/ndb/CMakeLists.txt
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/CMakeLists.txt	2011-03-28 07:59:35 +0000
@@ -18,6 +18,11 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
     ${CMAKE_SOURCE_DIR}/cmake
     ${CMAKE_SOURCE_DIR}/storage/ndb/cmake)
 
+# 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(SOURCE_SUBLIBS)
   # Sourced by libmysqld/CMakeLists.txt in 5.1 only to get
   # NDBCLUSTER_SOURCES and NDBCLUSTER_LIBS, don't configure

Attachment: [text/bzr-bundle] bzr/[e-mail]