bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:4253)

[magnus.blaudd]

#At file:///home/msvensson/mysql/tmp/6MWYPdfoGW/7.1/ based on revid:magnus.blaudd@stripped

 4253 magnus.blaudd@stripped	2011-06-21 [merge]
      Merge 7.0 -> 7.1

    modified:
      mysql-test/t/ctype_cp932_binlog_stm.test
=== modified file 'mysql-test/t/ctype_cp932_binlog_stm.test'
--- a/mysql-test/t/ctype_cp932_binlog_stm.test	2010-12-09 17:12:41 +0000
+++ b/mysql-test/t/ctype_cp932_binlog_stm.test	2011-06-21 15:03:03 +0000
@@ -34,7 +34,7 @@ delimiter ;|
 # the log's contents) that caused the server crash.
 
 -- disable_query_log
-call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'read error', data_len: 66125, event_type: 116");
+call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'read error', data_len: 66126, event_type: 116");
 -- enable_query_log
 
 --error 1220

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).