From: Ole John Aske
Date: December 9 2010 12:53pm
Subject: bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3396 to 3397)
List-Archive: http://lists.mysql.com/commits/126413
Message-Id: <20101209125340.B7249223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3397 Ole John Aske	2010-12-09
      SPJ-scan-scan: 'magic patch' to make ctype_cp932_binlog_stm.test pass

    modified:
      mysql-test/t/ctype_cp932_binlog_stm.test
 3396 Ole John Aske	2010-12-09
      PJS-scan-scan : Updated resultfile as explain output changed slightly after fix for #58818 
      may add an extra 'IS TRUE' to the having predicate.

    modified:
      mysql-test/r/subselect3.result
=== modified file 'mysql-test/t/ctype_cp932_binlog_stm.test'
--- a/mysql-test/t/ctype_cp932_binlog_stm.test	2010-10-12 11:54:35 +0000
+++ b/mysql-test/t/ctype_cp932_binlog_stm.test	2010-12-09 12:53:08 +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: 66124, event_type: 116");
+call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'read error', data_len: 66125, event_type: 116");
 -- enable_query_log
 
 --error 1220

No bundle (reason: useless for push emails).