bzr push into mysql-5.5-cluster-7.3 branch (mauritz.sundell:3899 to 3900)

[Mauritz Sundell]

 3900 Mauritz Sundell	2012-07-12 [merge]
      ndb - merge 7.2 to 7.3

    modified:
      storage/ndb/test/run-test/conf-ndb07.cnf
 3899 magnus.blaudd@stripped	2012-07-06 [merge]
      Merge 7.2 -> 7.3

    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/ndb_config.h.in
      storage/ndb/include/util/ndb_opts.h
      storage/ndb/ndb_configure.cmake
      storage/ndb/src/common/util/CMakeLists.txt
      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/test/run-test/conf-ndb07.cnf'
--- a/storage/ndb/test/run-test/conf-ndb07.cnf	2012-03-21 14:43:07 +0000
+++ b/storage/ndb/test/run-test/conf-ndb07.cnf	2012-07-12 15:39:36 +0000
@@ -9,9 +9,9 @@ mt = 2
 
 [mysqld]
 skip-innodb
-loose-skip-bdb
 skip-grant-tables
 socket=mysql.sock
+default-storage-engine=myisam
 
 [client]
 protocol=tcp

No bundle (reason: useless for push emails).