bzr push into mysql-5.5-cluster branch (magnus.blaudd:3564 to 3565)

[magnus.blaudd]

 3565 magnus.blaudd@stripped	2011-10-03 [merge]
      Merge

    modified:
      storage/ndb/include/CMakeLists.txt
      storage/ndb/ndb_configure.cmake
 3564 Jonas Oreland	2011-10-03 [merge]
      ndb - merge 70-spj-scan-scan into 72

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.test
=== modified file 'storage/ndb/include/CMakeLists.txt'
--- a/storage/ndb/include/CMakeLists.txt	2011-07-05 12:46:07 +0000
+++ b/storage/ndb/include/CMakeLists.txt	2011-10-03 11:34:40 +0000
@@ -24,6 +24,8 @@ CHECK_TYPE_SIZE("long long" NDB_SIZEOF_L
 CONFIGURE_FILE(ndb_types.h.in
                ${CMAKE_CURRENT_SOURCE_DIR}/ndb_types.h
                @ONLY)
+# Exclude ndb_types.h from "make dist"
+LIST(APPEND CPACK_SOURCE_IGNORE_FILES include/ndb_types\\\\.h$)
 
 #
 # Read a value for variable from ndb_configure.m4
@@ -86,4 +88,6 @@ ENDIF()
 CONFIGURE_FILE(ndb_version.h.in
                ${CMAKE_CURRENT_SOURCE_DIR}/ndb_version.h
                @ONLY)
+# Exclude ndb_version.h from "make dist"
+LIST(APPEND CPACK_SOURCE_IGNORE_FILES include/ndb_version\\\\.h$)
 

=== modified file 'storage/ndb/ndb_configure.cmake'
--- a/storage/ndb/ndb_configure.cmake	2011-09-22 00:48:32 +0000
+++ b/storage/ndb/ndb_configure.cmake	2011-10-03 11:34:40 +0000
@@ -186,6 +186,8 @@ ENDIF()
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/ndb_config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/include/ndb_config.h)
+# Exclude ndb_config.h from "make dist"
+LIST(APPEND CPACK_SOURCE_IGNORE_FILES include/ndb_config\\\\.h$)
 
 # Define HAVE_NDB_CONFIG_H to make ndb_global.h include the
 # generated ndb_config.h

No bundle (reason: useless for push emails).