List:Commits« Previous MessageNext Message »
From:jonas oreland Date:December 20 2011 8:48am
Subject:bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4391 to 4392)
View as plain text  
 4392 jonas oreland	2011-12-20 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/ndbapi/testSystemRestart.cpp
 4391 Jonas Oreland	2011-12-19 [merge]
      ndb - merge 70 to 71

    modified:
      sql/ha_ndb_index_stat.cc
      sql/ha_ndb_index_stat.h
      sql/ha_ndbcluster.cc
      storage/ndb/include/ndbapi/NdbIndexStat.hpp
      storage/ndb/src/kernel/blocks/LocalProxy.cpp
      storage/ndb/src/kernel/blocks/LocalProxy.hpp
      storage/ndb/src/ndbapi/NdbIndexStat.cpp
      storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
      storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/tools/ndb_index_stat.cpp
=== modified file 'storage/ndb/src/ndbapi/ndberror.c'
--- a/storage/ndb/src/ndbapi/ndberror.c	2011-12-19 14:17:21 +0000
+++ b/storage/ndb/src/ndbapi/ndberror.c	2011-12-20 08:46:45 +0000
@@ -583,7 +583,7 @@ ErrorBundle ErrorCodes[] = {
   { 1426, DMEC, SE, "No such subscriber" },
   { 1427, DMEC, NR, "Api node died, when SUB_START_REQ reached node "},
   { 1428, DMEC, IE, "No replica to scan on this node (internal index stats error)" },
-  { 1429, DMEC, IE, "Subscriber node undefined in SubStartReq (config change??)" },
+  { 1429, DMEC, IE, "Subscriber node undefined in SubStartReq (config change \?)" },
 
   { 4004, DMEC, AE, "Attribute name or id not found in the table" },
   

=== modified file 'storage/ndb/test/ndbapi/testSystemRestart.cpp'
--- a/storage/ndb/test/ndbapi/testSystemRestart.cpp	2011-07-04 16:30:34 +0000
+++ b/storage/ndb/test/ndbapi/testSystemRestart.cpp	2011-12-20 08:46:45 +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).
Thread
bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4391 to 4392) jonas oreland20 Dec