bzr push into mysql-5.1-telco-7.1 branch (mauritz.sundell:4589 to 4590)

[Mauritz Sundell]

 4590 Mauritz Sundell	2012-07-12 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/test/run-test/conf-ndb07.cnf
 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
=== 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).