bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4625 to 4626)

[magnus.blaudd]

 4626 magnus.blaudd@stripped	2012-10-16
      ndb_backup_rate.test
       - skip test if mysqld is being run under valgrind, since it makes it
        hardy impossible to fill up the redo log of ndbd(s)

    modified:
      mysql-test/suite/ndb/t/ndb_backup_rate.test
 4625 Maitrayi Sabaratnam	2012-10-12 [merge]
      Merge 7.0->7.1

    modified:
      storage/ndb/src/mgmclient/CommandInterpreter.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
=== modified file 'mysql-test/suite/ndb/t/ndb_backup_rate.test'
--- a/mysql-test/suite/ndb/t/ndb_backup_rate.test	2012-09-13 20:18:47 +0000
+++ b/mysql-test/suite/ndb/t/ndb_backup_rate.test	2012-10-16 11:07:51 +0000
@@ -1,5 +1,9 @@
 -- source include/have_ndb.inc
 
+# Valgrinding slows the mysqld down and thus making it
+# impossible to fill the redo log of ndbd(s) -> skip test
+--source include/not_valgrind.inc
+
 use test;
 create table t1 (a varchar(1024)) engine=ndb max_rows=100000000;
 insert into t1 values (repeat('I', 1024));

No bundle (reason: useless for push emails).