From: magnus.blaudd
Date: October 10 2011 7:56am
Subject: bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4584 to 4585)
List-Archive: http://lists.mysql.com/commits/141367
Message-Id: <201110100756.p9A7uIe5005436@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4585 magnus.blaudd@stripped	2011-10-10 [merge]
      Merge 6.3->7.0

    added:
      mysql-test/suite/ndb_big/bug37983-master.opt
      mysql-test/suite/ndb_big/disabled.def
 4584 Maitrayi Sabaratnam	2011-10-07
      Bug 12598636 - DATA NODE SHOULD SHUTDOWN WHEN IT DETECTS INCORRECT TUPLE CHECKSUM

    modified:
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
=== added file 'mysql-test/suite/ndb_big/bug37983-master.opt'
--- a/mysql-test/suite/ndb_big/bug37983-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb_big/bug37983-master.opt	2011-10-10 07:40:12 +0000
@@ -0,0 +1 @@
+--testcase-timeout=30

=== added file 'mysql-test/suite/ndb_big/disabled.def'
--- a/mysql-test/suite/ndb_big/disabled.def	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb_big/disabled.def	2011-10-10 07:40:12 +0000
@@ -0,0 +1 @@
+smoke : not ready for automated testing yet

No bundle (reason: useless for push emails).