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) List-Archive: http://lists.mysql.com/commits/131668 Message-Id: <201102190242.p1J2SLlA027570@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3972150890896672567==" --===============3972150890896672567== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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; iwaitUntilReady() == 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; --===============3972150890896672567== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/martin.zaun@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@stripped # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: 75ca72bc80cf6f1c3c06bf833055306856c7cb63 # timestamp: 2011-02-18 18:42:52 -0800 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: martin.zaun@stripped\ # 4x84rrn9i2d1uay9 # # Begin bundle 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 --===============3972150890896672567==--