From: magnus.blaudd
Date: September 12 2012 11:29am
Subject: bzr push into mysql-5.1-telco-6.3 branch (magnus.blaudd:3481 to 3482)
List-Archive: http://lists.mysql.com/commits/144736
Message-Id: <20120912112928.30918.46344.3482@peek02.se.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3482 magnus.blaudd@stripped	2012-09-12
      Fix test case failure which depends on the binlogs content by adjusting
      the used binlog position

    modified:
      mysql-test/r/ctype_cp932_binlog_stm.result
      mysql-test/t/ctype_cp932_binlog_stm.test
 3481 Martin Skold	2012-08-21
      ndb - bump version to 6.3.50

    modified:
      configure.in
=== modified file 'mysql-test/r/ctype_cp932_binlog_stm.result'
--- a/mysql-test/r/ctype_cp932_binlog_stm.result	2012-02-13 09:39:05 +0000
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result	2012-09-12 11:12:19 +0000
@@ -45,7 +45,7 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE t4
 End of 5.0 tests
 call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'Sanity check failed', data_len: 258, event_type: 49");
-SHOW BINLOG EVENTS FROM 365;
+SHOW BINLOG EVENTS FROM 366;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error
 Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment.
 CREATE TABLE t1 (a varchar(16)) character set cp932;

=== modified file 'mysql-test/t/ctype_cp932_binlog_stm.test'
--- a/mysql-test/t/ctype_cp932_binlog_stm.test	2012-02-13 09:39:05 +0000
+++ b/mysql-test/t/ctype_cp932_binlog_stm.test	2012-09-12 11:12:19 +0000
@@ -30,13 +30,13 @@ delimiter ;|
 
 #
 # #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump 
-# Note: 365 (depends on FD event size changes) is a magic position (found experimentally, depends on  
+# Note: 366 (depends on FD event size changes) is a magic position (found experimentally, depends on  
 # the log's contents) that caused the server crash.
 
 call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'Sanity check failed', data_len: 258, event_type: 49");
 
 --error 1220
-SHOW BINLOG EVENTS FROM 365;
+SHOW BINLOG EVENTS FROM 366;
 
 --echo Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment.
 CREATE TABLE t1 (a varchar(16)) character set cp932;

No bundle (reason: useless for push emails).