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

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4020 Magnus Blåudd	2010-11-18
      ndb
       - move the define of NDB_PORT to ndb_config.h

    modified:
      storage/ndb/CMakeLists.txt
      storage/ndb/include/ndb_config.h.in
      storage/ndb/ndb_configure.cmake
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2010-11-17 11:35:04 +0000
+++ b/storage/ndb/CMakeLists.txt	2010-11-18 09:38:59 +0000
@@ -58,14 +58,6 @@ IF(WITH_NDB_TEST)
   MESSAGE(STATUS "Building NDB test programs")
 ENDIF()
 
-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)
 

=== modified file 'storage/ndb/include/ndb_config.h.in'
--- a/storage/ndb/include/ndb_config.h.in	2010-11-09 10:45:29 +0000
+++ b/storage/ndb/include/ndb_config.h.in	2010-11-18 09:38:59 +0000
@@ -34,3 +34,4 @@
 #cmakedefine HAVE_LINUX_FUTEX 1
 #cmakedefine HAVE_ATOMIC_H 1
 #cmakedefine HAVE_SUN_PREFETCH_H 1
+#cmakedefine NDB_PORT @NDB_PORT@

=== modified file 'storage/ndb/ndb_configure.cmake'
--- a/storage/ndb/ndb_configure.cmake	2010-11-10 09:42:49 +0000
+++ b/storage/ndb/ndb_configure.cmake	2010-11-18 09:38:59 +0000
@@ -130,6 +130,13 @@ IF(WITH_NDBMTD)
 
 ENDIF()
 
+SET(WITH_NDB_PORT "" CACHE INTEGER
+  "Default port used by MySQL Cluster management server")
+IF(WITH_NDB_PORT GREATER 0)
+  SET(NDB_PORT ${WITH_NDB_PORT})
+  MESSAGE(STATUS "Setting MySQL Cluster management server port to ${NDB_PORT}")
+ENDIF()
+
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/ndb_config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/include/ndb_config.h)
 

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