bzr commit into mysql-5.1-telco-7.0 branch (bernhard.ocklin:3547)

[Bernd Ocklin]

#At file:///Users/bocklin/Programming/mysql-5.1-telco-7.0/ based on revid:jonas@stripped

 3547 Bernd Ocklin	2010-05-24
      enable ndb specific windows cmake options in 7.0

    modified:
      storage/ndb/CMakeLists.txt
      storage/ndb/test/run-test/autotest-boot.sh
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2010-03-09 09:34:57 +0000
+++ b/storage/ndb/CMakeLists.txt	2010-05-24 12:07:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 MySQL AB
+# Copyright (C) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,14 +15,43 @@
 
 INCLUDE("${CMAKE_SOURCE_DIR}/storage/ndb/cmake/libutils.cmake")
 
+OPTION(WITH_NDB_TEST
+  "Include the NDB Cluster ndbapi test programs" OFF)
+
+SET(WITH_NDB_PORT "" CACHE INTEGER
+  "Default port used by NDB Cluster management server")
+IF(WITH_NDB_PORT GREATER 0)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDB_PORT=\"${WITH_NDB_PORT}\"")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDB_PORT=\"${WITH_NDB_PORT}\"")
+  MESSAGE ( STATUS "Setting management server port to ${WITH_NDB_PORT}" )
+ENDIF()
+
+OPTION(WITH_NDB_BINLOG
+  "Disable NDB binlog" ON)
+
+OPTION(WITH_NDBMTD
+  "Dont build the MySQL Cluster multithreadded data node" ON)
+
 # 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")
 
-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)
+
+OPTION(WITH_NDB_DEBUG
+  "Disable special ndb debug features" OFF)
+IF(WITH_NDB_DEBUG)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -DVM_TRACE -DNDB_DEBUG -DERROR_INSERT -DARRAY_GUARD -DACC_SAFE_QUEUE")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_DEBUG} -DVM_TRACE -DNDB_DEBUG -DERROR_INSERT -DARRAY_GUARD -DACC_SAFE_QUEUE")
+ELSE()
+  IF(WITH_ERROR_INSERT)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DERROR_INSERT")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DERROR_INSERT")
+  ENDIF()
+ENDIF()
 
 # Disable some warnings for NDB build:
 # 4355: 'this': used in base member initializer list

=== modified file 'storage/ndb/test/run-test/autotest-boot.sh'
--- a/storage/ndb/test/run-test/autotest-boot.sh	2010-04-28 08:10:55 +0000
+++ b/storage/ndb/test/run-test/autotest-boot.sh	2010-05-24 12:07:12 +0000
@@ -234,8 +234,8 @@ then
         if uname | grep -iq cygwin
         then
             install_dir_dos=`cygpath -w $install_dir`
-            cmd /c cscript win/configure.js WITH_NDBCLUSTER_STORAGE_ENGINE WITH_NDB_TEST --without-plugins=archive,blackhole,example,federated
-            cmd /c cmake -G "Visual Studio 9 2008" -DERROR_INSERT=1 -DCMAKE_INSTALL_PREFIX=$install_dir_dos
+            cmd /c cscript win/configure.js WITH_NDBCLUSTER_STORAGE_ENGINE --without-plugins=archive,blackhole,example,federated
+            cmd /c cmake -G "Visual Studio 9 2008" -DERROR_INSERT=1 -DWITH_NDB_TEST -DCMAKE_INSTALL_PREFIX=$install_dir_dos
             cmd /c devenv.com MySql.sln /Build RelWithDebInfo
             cmd /c devenv.com MySql.sln /Project INSTALL /Build
         else


Attachment: [text/bzr-bundle]