bzr push into mysql-5.1-telco-7.1 branch (jonas:3828 to 3829)

[Jonas Oreland]

 3829 Jonas Oreland	2010-09-23 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/test/src/NdbBackup.cpp
 3828 Magnus Blåudd	2010-09-23 [merge]
      Merge

    renamed:
      mysql-test/include/ndb_desc_print.inc => mysql-test/suite/ndb/include/ndb_desc_print.inc
      mysql-test/include/ndb_execute_count.inc => mysql-test/suite/ndb/include/ndb_execute_count.inc
      mysql-test/include/ndb_init_execute_count.inc => mysql-test/suite/ndb/include/ndb_init_execute_count.inc
      mysql-test/include/ndb_init_scan_counts.inc => mysql-test/suite/ndb/include/ndb_init_scan_counts.inc
      mysql-test/include/ndb_scan_counts.inc => mysql-test/suite/ndb/include/ndb_scan_counts.inc
    modified:
      mysql-test/suite/ndb/t/ndb_bulk_delete.test
      mysql-test/suite/ndb/t/ndb_native_default_support.test
      mysql-test/suite/ndb/t/ndb_partition_hash.test
      mysql-test/suite/ndb/t/ndb_partition_key.test
      mysql-test/suite/ndb/t/ndb_partition_list.test
      mysql-test/suite/ndb/t/ndb_partition_range.test
      mysql-test/suite/ndb/t/ndb_read_multi_range.test
      mysql-test/suite/ndb/t/ndb_sql_allow_batching.test
      mysql-test/suite/ndb/t/ndb_update_no_read.test
      storage/ndb/include/portlib/NdbDir.hpp
      storage/ndb/src/common/portlib/NdbDir.cpp
      storage/ndb/src/cw/cpcd/main.cpp
      storage/ndb/src/kernel/angel.cpp
      storage/ndb/src/kernel/ndbd.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/mgmsrv/main.cpp
=== modified file 'storage/ndb/test/src/NdbBackup.cpp'
--- a/storage/ndb/test/src/NdbBackup.cpp	2010-06-14 12:16:32 +0000
+++ b/storage/ndb/test/src/NdbBackup.cpp	2010-09-23 08:24:52 +0000
@@ -64,7 +64,7 @@ NdbBackup::clearOldBackups()
      * Clear old backup files
      */ 
     BaseString tmp;
-    tmp.assfmt("ssh -v %s rm -rfv %s/BACKUP", host, path);
+    tmp.assfmt("ssh -v %s rm -rf %s/BACKUP", host, path);
   
     ndbout << "buf: "<< tmp.c_str() <<endl;
     int res = system(tmp.c_str());  

Attachment: [text/bzr-bundle] bzr/[e-mail]