diff options
| author | unknown <pekka@clam.ndb.mysql.com> | 2006-06-22 19:26:15 +0200 |
|---|---|---|
| committer | unknown <pekka@clam.ndb.mysql.com> | 2006-06-22 19:26:15 +0200 |
| commit | 5aaba8297c5ea5447a53a54b73f73e6f0623f7f3 (patch) | |
| tree | 23cf5c899705089cff0e6c501ccb357bbb49bb2e /storage/ndb/test | |
| parent | 2dc4e1709852cace46d33e59329de245d6be937f (diff) | |
| download | mariadb-git-5aaba8297c5ea5447a53a54b73f73e6f0623f7f3.tar.gz | |
ndb - bug#18781 post-merge 5.0->5.1 fixes (one more to come)
have to push this to be able to push 5.0
storage/ndb/include/kernel/signaldata/DictLock.hpp:
Rename: ndb/include/kernel/signaldata/DictLock.hpp -> storage/ndb/include/kernel/signaldata/DictLock.hpp
storage/ndb/src/kernel/blocks/dbdict/DictLock.txt:
Rename: ndb/src/kernel/blocks/dbdict/DictLock.txt -> storage/ndb/src/kernel/blocks/dbdict/DictLock.txt
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
debug
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
bug#18781 post-merge 5.0->5.1 fixes (one more to come)
storage/ndb/src/ndbapi/ndberror.c:
bug#18781 post-merge 5.0->5.1 fixes (one more to come)
storage/ndb/test/ndbapi/testDict.cpp:
bug#18781 post-merge 5.0->5.1 fixes (one more to come)
storage/ndb/test/src/NdbRestarter.cpp:
bug#18781 post-merge 5.0->5.1 fixes (one more to come)
Diffstat (limited to 'storage/ndb/test')
| -rw-r--r-- | storage/ndb/test/ndbapi/testDict.cpp | 9 | ||||
| -rw-r--r-- | storage/ndb/test/src/NdbRestarter.cpp | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/storage/ndb/test/ndbapi/testDict.cpp b/storage/ndb/test/ndbapi/testDict.cpp index 6eb2ac3fba7..f6277484b04 100644 --- a/storage/ndb/test/ndbapi/testDict.cpp +++ b/storage/ndb/test/ndbapi/testDict.cpp @@ -1852,7 +1852,9 @@ runDictOps(NDBT_Context* ctx, NDBT_Step* step) Ndb* pNdb = GETNDB(step); NdbDictionary::Dictionary* pDic = pNdb->getDictionary(); const NdbDictionary::Table* pTab = ctx->getTab(); - const char* tabName = pTab->getName(); + //const char* tabName = pTab->getName(); //XXX what goes on? + char tabName[40]; + strcpy(tabName, pTab->getName()); const unsigned long maxsleep = 100; //ms @@ -1888,7 +1890,7 @@ runDictOps(NDBT_Context* ctx, NDBT_Step* step) // replace by the Retrieved table pTab = pTab2; - int records = myRandom48(ctx->getNumRecords()); + int records = ctx->getNumRecords(); g_info << "2: load " << records << " records" << endl; HugoTransactions hugoTrans(*pTab); if (hugoTrans.loadTable(pNdb, records) != 0) { @@ -1925,7 +1927,8 @@ runDictOps(NDBT_Context* ctx, NDBT_Step* step) result = NDBT_FAILED; break; } - if (pDic->getNdbError().code != 709) { + if (pDic->getNdbError().code != 709 && + pDic->getNdbError().code != 723) { const NdbError err = pDic->getNdbError(); g_err << "2: " << tabName << ": verify drop: " << err << endl; result = NDBT_FAILED; diff --git a/storage/ndb/test/src/NdbRestarter.cpp b/storage/ndb/test/src/NdbRestarter.cpp index 2c16a05240d..b25c42ec18e 100644 --- a/storage/ndb/test/src/NdbRestarter.cpp +++ b/storage/ndb/test/src/NdbRestarter.cpp @@ -329,7 +329,10 @@ NdbRestarter::waitNodesState(int * _nodes, int _num_nodes, } g_info << "State node " << ndbNode->node_id << " " - << ndb_mgm_get_node_status_string(ndbNode->node_status)<< endl; + << ndb_mgm_get_node_status_string(ndbNode->node_status); + if (ndbNode->node_status == NDB_MGM_NODE_STATUS_STARTING) + g_info<< ", start_phase=" << ndbNode->start_phase; + g_info << endl; assert(ndbNode != NULL); |