bzr push into mysql-5.5-cluster-7.2 branch (jonas.oreland:3739 to 3740)

[jonas oreland]

 3740 jonas oreland	2011-12-20 [merge]
      ndb - merge 71 to 72

    modified:
      storage/ndb/test/ndbapi/testSystemRestart.cpp
 3739 magnus.blaudd@stripped	2011-12-19 [merge]
      Merge

    added:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_ddl_open_trans.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_ddl_open_trans.test
    modified:
      mysql-test/suite/ndb/r/ndb_multi.result
      mysql-test/suite/ndb/t/ndb_multi.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
=== modified file 'storage/ndb/test/ndbapi/testSystemRestart.cpp'
--- a/storage/ndb/test/ndbapi/testSystemRestart.cpp	2011-07-05 12:46:07 +0000
+++ b/storage/ndb/test/ndbapi/testSystemRestart.cpp	2011-12-20 08:49:07 +0000
@@ -1405,6 +1405,8 @@ int runSR_DD_1(NDBT_Context* ctx, NDBT_S
   HugoTransactions hugoTrans(*ctx->getTab());
   while(i<=loops && result != NDBT_FAILED)
   {
+    if (i > 0 && ctx->closeToTimeout(15))
+      break;
 
     if (lcploop)
     {
@@ -1508,6 +1510,8 @@ int runSR_DD_2(NDBT_Context* ctx, NDBT_S
   HugoTransactions hugoTrans(*ctx->getTab());
   while(i<=loops && result != NDBT_FAILED)
   {
+    if (i > 0 && ctx->closeToTimeout(15))
+      break;
 
     if (lcploop)
     {
@@ -1612,6 +1616,8 @@ int runSR_DD_3(NDBT_Context* ctx, NDBT_S
   HugoTransactions hugoTrans(*ctx->getTab());
   while(i<=loops && result != NDBT_FAILED)
   {
+    if (i > 0 && ctx->closeToTimeout(15))
+      break;
 
     if (lcploop)
     {
@@ -1853,6 +1859,9 @@ runTO(NDBT_Context* ctx, NDBT_Step* step
   Uint32 i = 0;
   while(i<=loops && result != NDBT_FAILED)
   {
+    if (i > 0 && ctx->closeToTimeout(35))
+      break;
+
     CHECK(res.dumpStateAllNodes(val, 1) == 0);
 
     int filter[] = { 15, NDB_MGM_EVENT_CATEGORY_CHECKPOINT, 0 };

No bundle (reason: useless for push emails).