bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:3917 to 3918)

[magnus.blaudd]

 3918 magnus.blaudd@stripped	2012-05-10
      ndb
       - remove mystery removal of IF(WITH_NDB_TEST) from CMakeLists.txt

    modified:
      storage/ndb/test/CMakeLists.txt
 3917 Ole John Aske	2012-05-08
      Another followup of changes introduced by revno 3913 :-(
      
      That change had the side effect that it turned on mysql DBUG logging for
      the entire ndb_join_pushdown.test - Which was really huge.
      
      With this fix the 'debug' variable is reset to initial saved value
      when the 'max_NNrows_in_spj_batches' is no longer required.

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
=== modified file 'storage/ndb/test/CMakeLists.txt'
--- a/storage/ndb/test/CMakeLists.txt	2012-04-11 10:34:58 +0000
+++ b/storage/ndb/test/CMakeLists.txt	2012-05-10 13:48:53 +0000
@@ -15,8 +15,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 ADD_SUBDIRECTORY(src)
-#IF(WITH_NDB_TEST)
+IF(WITH_NDB_TEST)
 ADD_SUBDIRECTORY(tools)
 ADD_SUBDIRECTORY(ndbapi)
 ADD_SUBDIRECTORY(run-test)
-#ENDIF(WITH_NDB_TEST)
+ENDIF(WITH_NDB_TEST)

No bundle (reason: useless for push emails).