From: magnus.blaudd
Date: June 21 2011 3:10pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4252 to 4253)
List-Archive: http://lists.mysql.com/commits/139623
Message-Id: <20110621151036.6331E134016@pilot>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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

    modified:
      mysql-test/t/ctype_cp932_binlog_stm.test
 4252 magnus.blaudd@stripped	2011-06-21 [merge]
      Merge

    modified:
      storage/ndb/CMakeLists.txt
      storage/ndb/clusterj/CMakeLists.txt
      storage/ndb/src/CMakeLists.txt
      storage/ndb/src/common/debugger/CMakeLists.txt
      storage/ndb/src/common/debugger/signaldata/CMakeLists.txt
      storage/ndb/src/common/logger/CMakeLists.txt
      storage/ndb/src/common/mgmcommon/CMakeLists.txt
      storage/ndb/src/common/transporter/CMakeLists.txt
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
      storage/ndb/src/common/util/CMakeLists.txt
      storage/ndb/src/kernel/CMakeLists.txt
      storage/ndb/src/mgmapi/CMakeLists.txt
      storage/ndb/src/mgmsrv/CMakeLists.txt
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/ndbapi/CMakeLists.txt
      storage/ndb/src/ndbjtie/mysql/CMakeLists.txt
      storage/ndb/test/ndbapi/testBasic.cpp
=== 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: useless for push emails).