bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4954 to 4955)

[magnus.blaudd]

 4955 magnus.blaudd@stripped	2012-07-06
      ndb
       - fix typo in new cmake include file, should use CACHE INTERNAL as two words
         instead of CACHE INTERNAL
       - add missing "not" to message saying that file was "not found"

    modified:
      storage/ndb/cmake/ndb_check_mysql_include_file.cmake
      storage/ndb/include/ndb_config.h.in
 4954 magnus.blaudd@stripped	2012-07-05 [merge]
      Merge

    modified:
      mysql-test/suite/ndb/r/ndb_blob_big.result
      mysql-test/suite/ndb/t/ndb_blob_big.test
      storage/ndb/src/mgmapi/CMakeLists.txt
=== 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).