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

 4967 magnus.blaudd@stripped	2012-09-12
      Merge 6.3 -> 7.0

    modified:
      mysql-test/r/ctype_cp932_binlog_stm.result
      mysql-test/t/ctype_cp932_binlog_stm.test
 4966 magnus.blaudd@stripped	2012-09-12 [merge]
      Merge

    modified:
      storage/ndb/include/util/NdbOut.hpp
      storage/ndb/src/mgmapi/LocalConfig.cpp
      storage/ndb/src/mgmapi/LocalConfig.hpp
      storage/ndb/test/include/NDBT_Stats.hpp
      storage/ndb/test/ndbapi/testRedo.cpp
=== modified file 'mysql-test/r/ctype_cp932_binlog_stm.result'
--- a/mysql-test/r/ctype_cp932_binlog_stm.result	2012-02-13 12:23:55 +0000
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result	2012-09-12 11:28:45 +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 370;
+SHOW BINLOG EVENTS FROM 371;
 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 12:23:55 +0000
+++ b/mysql-test/t/ctype_cp932_binlog_stm.test	2012-09-12 11:28:45 +0000
@@ -30,13 +30,13 @@ delimiter ;|
 
 #
 # #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump 
-# Note: 370 (depends on FD event size changes) is a magic position (found experimentally, depends on
+# Note: 371 (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 370;
+SHOW BINLOG EVENTS FROM 371;
 
 --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).