List:Commits« Previous MessageNext Message »
From:Martin Zaun Date:February 19 2011 2:42am
Subject:bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4092 to 4093)
View as plain text  
 4093 Martin Zaun	2011-02-18 [merge]
      merge Jonas's commit from 7.0 to 7.1

    modified:
      storage/ndb/test/ndbapi/testSystemRestart.cpp
 4092 Martin Zaun	2011-02-18 [merge]
      merge Jonas's (?) commits from 7.0 to 7.1

    modified:
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
      storage/ndb/include/ndb_constants.h
      storage/ndb/include/ndbapi/NdbDictionary.hpp
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/lgman.cpp
      storage/ndb/src/ndbapi/NdbDictionary.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
=== modified file 'storage/ndb/test/ndbapi/testSystemRestart.cpp'
--- a/storage/ndb/test/ndbapi/testSystemRestart.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/ndbapi/testSystemRestart.cpp	2011-02-18 18:40:25 +0000
@@ -996,6 +996,7 @@ int runSystemRestart8(NDBT_Context* ctx,
     CHECK(restarter.waitNodesStartPhase(a_nodeIds, nodeCount-1, 3, 120) == 0);
     CHECK(restarter.startNodes(&nodeId, 1) == 0);
     CHECK(restarter.waitClusterStarted(timeout) == 0);
+    CHECK(pNdb->waitUntilReady() == 0);
     
     int count = records - 1;
     CHECK(utilTrans.selectCount(pNdb, 64, &count) == 0);
@@ -1342,6 +1343,7 @@ runBug28770(NDBT_Context* ctx, NDBT_Step
     restarter.insertErrorInAllNodes(6024);
     CHECK(restarter.startAll()== 0);
     CHECK(restarter.waitClusterStarted() == 0);
+    CHECK(pNdb->waitUntilReady() == 0);
     CHECK(utilTrans.selectCount(pNdb, 64, &count) == 0);
     CHECK(count == records);
     i++;
@@ -1443,7 +1445,8 @@ int runSR_DD_1(NDBT_Context* ctx, NDBT_S
     CHECK(restarter.waitClusterNoStart() == 0);
     CHECK(restarter.startAll() == 0);
     CHECK(restarter.waitClusterStarted() == 0);
-    
+    CHECK(pNdb->waitUntilReady() == 0);
+
     ndbout << "Starting backup..." << flush;
     CHECK(backup.start() == 0);
     ndbout << "done" << endl;
@@ -1542,6 +1545,8 @@ int runSR_DD_2(NDBT_Context* ctx, NDBT_S
     CHECK(restarter.waitClusterNoStart() == 0);
     CHECK(restarter.startAll() == 0);
     CHECK(restarter.waitClusterStarted() == 0);
+    CHECK(pNdb->waitUntilReady() == 0);
+
     if (error)
     {
       restarter.insertErrorInAllNodes(error);
@@ -1730,6 +1735,7 @@ int runBug22696(NDBT_Context* ctx, NDBT_
     CHECK(restarter.insertErrorInAllNodes(7072) == 0);
     CHECK(restarter.startAll() == 0);
     CHECK(restarter.waitClusterStarted() == 0);
+    CHECK(pNdb->waitUntilReady() == 0);
 
     i++;
     if (i < loops)
@@ -1791,7 +1797,7 @@ runBasic(NDBT_Context* ctx, NDBT_Step* s
     CHECK(restarter.startAll() == 0);
     CHECK(restarter.waitClusterStarted() == 0);
     CHECK(pNdb->waitUntilReady() == 0);
-    
+
     for (int i = 0; i<NDBT_Tables::getNumTables(); i++)
     {
       const NdbDictionary::Table* tab = 
@@ -1911,7 +1917,8 @@ runTO(NDBT_Context* ctx, NDBT_Step* step
     } while (NdbTick_CurrentMillisecond() < (now + 30000));
     g_err.m_out = save[0];
     CHECK(res.waitClusterStarted() == 0);
-    
+    CHECK(pNdb->waitUntilReady() == 0);
+
     hugoTrans.clearTable(pNdb);
     hugoTrans.loadTable(pNdb, rows);
     
@@ -2079,6 +2086,8 @@ int runBug46651(NDBT_Context* ctx, NDBT_
   if (res.waitClusterStarted())
     return NDBT_FAILED;
 
+  pNdb->waitUntilReady();
+
   NdbDictionary::Table newTab = *pTab;
   col.setName("ATTR4");
   col.setType(NdbDictionary::Column::Varbinary);
@@ -2101,6 +2110,7 @@ int runBug46651(NDBT_Context* ctx, NDBT_
   if (res.waitClusterStarted())
     return NDBT_FAILED;
 
+  pNdb->waitUntilReady();
   pDict->dropTable(tab.getName());
 
   return NDBT_OK;
@@ -2341,6 +2351,7 @@ runBug54611(NDBT_Context* ctx, NDBT_Step
     res.insertErrorInAllNodes(5055);
     res.startAll();
     res.waitClusterStarted();
+    pNdb->waitUntilReady();
   }
 
   return NDBT_OK;
@@ -2387,6 +2398,7 @@ runBug56961(NDBT_Context* ctx, NDBT_Step
     res.startNodes(&node, 1);
     ndbout_c("Waiting for %d to start", node);
     res.waitClusterStarted();
+    pNdb->waitUntilReady();
   }
 
   return NDBT_OK;


Attachment: [text/bzr-bundle] bzr/martin.zaun@oracle.com-20110219023152-ldz8b7jhklk216s0.bundle
Thread
bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4092 to 4093) Martin Zaun19 Feb