bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3254)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-cluster/ based on revid:magnus.blaudd@strippedsur

 3254 Magnus Blåudd	2011-03-28
      Merge

    modified:
      storage/ndb/CMakeLists.txt
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2011-03-28 08:03:55 +0000
+++ b/storage/ndb/CMakeLists.txt	2011-03-28 08:12:08 +0000
@@ -23,11 +23,14 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
 STRING(REPLACE "-Werror" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
 STRING(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 
-# Use same compiler defines as MySQL Server for debug compile
-SET(CMAKE_CXX_FLAGS_DEBUG
-    "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
-SET(CMAKE_C_FLAGS_DEBUG
-    "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+IF (MYSQL_VERSION_ID LESS 50500)
+  # Use same compiler defines as MySQL Server for debug compile
+  MESSAGE(STATUS "Setting same debug compile defines")
+  SET(CMAKE_CXX_FLAGS_DEBUG
+      "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+  SET(CMAKE_C_FLAGS_DEBUG
+      "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+ENDIF()
 
 IF(SOURCE_SUBLIBS)
   # Sourced by libmysqld/CMakeLists.txt in 5.1 only to get

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