bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4372 to 4373)

[Magnus Blåudd]

 4373 Magnus Blåudd	2011-05-12 [merge]
      Merge

    modified:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test
 4372 Jonas Oreland	2011-05-12
      ndb - bug#61147 - fix stop of other ndb_mgmd incorrectly reporting failure

    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test	2011-05-12 09:52:16 +0000
@@ -22,6 +22,13 @@ enable_query_log;
 --connection slave
 select count(*) from t1;
 
+# Add suppression for the LOST_EVENTS error message
+# which will occur on slave when master is restarted while
+# slave is running
+--disable_query_log
+call mtr.add_suppression("Slave.*: The incident LOST_EVENTS occured on the master");
+--enable_query_log
+
 --connection master
 
 --echo Restarting mysqld

No bundle (reason: useless for push emails).