bzr push into mysql-5.1-telco-7.1 branch (bernhard.ocklin:3601 to 3602)

[Bernd Ocklin]

 3602 Bernd Ocklin	2010-05-11
      add win error insert option for release builds

    modified:
      storage/ndb/CMakeLists.txt
 3601 Magnus Blåudd	2010-05-10 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/src/mgmsrv/Services.cpp
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2010-03-09 09:54:45 +0000
+++ b/storage/ndb/CMakeLists.txt	2010-05-11 07:44:25 +0000
@@ -27,6 +27,13 @@ SET(CMAKE_C_FLAGS_DEBUG
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DVM_TRACE -DNDB_DEBUG -DERROR_INSERT -DARRAY_GUARD")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DVM_TRACE -DNDB_DEBUG -DERROR_INSERT -DARRAY_GUARD")
 
+OPTION(WITH_ERROR_INSERT
+  "Enable error injection in MySQL Cluster" OFF)
+IF(WITH_ERROR_INSERT)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DERROR_INSERT")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DERROR_INSERT")
+ENDIF()
+
 # Disable some warnings for NDB build:
 # 4355: 'this': used in base member initializer list
 

Attachment: [text/bzr-bundle]