bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4588 to 4589)

[magnus.blaudd]

 4589 magnus.blaudd@stripped	2012-07-06 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/cmake/ndb_check_mysql_include_file.cmake
      storage/ndb/include/ndb_config.h.in
 4588 magnus.blaudd@stripped	2012-07-06 [merge]
      Merge 7.0 -> 7.1

    added:
      storage/ndb/cmake/ndb_check_mysql_include_file.cmake
    renamed:
      storage/ndb/src/common/util/ndb_opts.c => storage/ndb/src/common/util/ndb_opts.cpp
    modified:
      storage/ndb/include/util/ndb_opts.h
      storage/ndb/ndb_configure.cmake
      storage/ndb/src/common/util/CMakeLists.txt
      storage/ndb/src/common/util/Makefile.am
      storage/ndb/src/kernel/main.cpp
      storage/ndb/src/mgmclient/main.cpp
      storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
      storage/ndb/src/mgmsrv/main.cpp
      storage/ndb/test/ndbapi/testBitfield.cpp
      storage/ndb/test/ndbapi/test_event_multi_table.cpp
      storage/ndb/test/run-test/atrt.hpp
      storage/ndb/test/run-test/main.cpp
      storage/ndb/test/src/NDBT_Test.cpp
      storage/ndb/test/tools/connect.cpp
      storage/ndb/test/tools/hugoJoin.cpp
      storage/ndb/test/tools/log_listner.cpp
      storage/ndb/src/common/util/ndb_opts.cpp
=== modified file 'storage/ndb/cmake/ndb_check_mysql_include_file.cmake'
--- a/storage/ndb/cmake/ndb_check_mysql_include_file.cmake	2012-07-05 11:19:04 +0000
+++ b/storage/ndb/cmake/ndb_check_mysql_include_file.cmake	2012-07-06 09:41:37 +0000
@@ -17,12 +17,12 @@ MACRO(NDB_CHECK_MYSQL_INCLUDE_FILE INCLU
   IF("${VARIABLE}" MATCHES "^${VARIABLE}$")
     SET(_msg "Looking for MySQL include file ${INCLUDE}")
     MESSAGE(STATUS "${_msg}")
-    IF(EXISTS ${CMAKE_SOURCE_DIR}/include/${INCLUDE})
+    IF(EXISTS "${CMAKE_SOURCE_DIR}/include/${INCLUDE}")
       MESSAGE(STATUS "${_msg} - found")
-      SET(${VARIABLE} 1 CACHE_INTERNAL "Have MySQL include ${INCLUDE}")
+      SET(${VARIABLE} 1 CACHE INTERNAL "Have MySQL include ${INCLUDE}")
     ELSE()
-      MESSAGE(STATUS "${_msg} - found")
-      SET(${VARIABLE} "" CACHE_INTERNAL "Have MySQL include ${INCLUDE}")
+      MESSAGE(STATUS "${_msg} - not found")
+      SET(${VARIABLE} "" CACHE INTERNAL "Have MySQL include ${INCLUDE}")
     ENDIF()
   ENDIF()
 ENDMACRO()

=== modified file 'storage/ndb/include/ndb_config.h.in'
--- a/storage/ndb/include/ndb_config.h.in	2012-06-11 13:20:48 +0000
+++ b/storage/ndb/include/ndb_config.h.in	2012-07-06 09:41:37 +0000
@@ -46,4 +46,5 @@
 #cmakedefine HAVE_PTHREAD_MUTEXATTR_INIT 1
 #cmakedefine HAVE_PTHREAD_MUTEXATTR_SETTYPE 1
 #cmakedefine HAVE_PTHREAD_SETSCHEDPARAM 1
+#cmakedefine HAVE_MY_DEFAULT_H 1
 

No bundle (reason: useless for push emails).