database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-31 15:50:51 +03:00
Code Activity

Merge 4.1 with jonas irix clone

Browse Source
This commit is contained in:
joreland@mysql.com
2004-08-03 14:16:16 +02:00
parent c105f1ed8b d861fa8577
commit 20c86363f5
84 changed files with 472 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
ndb/test/src/NDBT_Test.cpp
View File

@@ -347,24 +347,24 @@ NDBT_TestCaseImpl1::NDBT_TestCaseImpl1(NDBT_TestSuite* psuite,
NDBT_TestCaseImpl1::~NDBT_TestCaseImpl1(){
NdbCondition_Destroy(waitThreadsCondPtr);
NdbMutex_Destroy(waitThreadsMutexPtr);
for(size_t i = 0; i < initializers.size(); i++)
size_t i;
for(i = 0; i < initializers.size(); i++)
delete initializers[i];
initializers.clear();
for(size_t i = 0; i < verifiers.size(); i++)
for(i = 0; i < verifiers.size(); i++)
delete verifiers[i];
verifiers.clear();
for(size_t i = 0; i < finalizers.size(); i++)
for(i = 0; i < finalizers.size(); i++)
delete finalizers[i];
finalizers.clear();
for(size_t i = 0; i < steps.size(); i++)
for(i = 0; i < steps.size(); i++)
delete steps[i];
steps.clear();
results.clear();
for(size_t i = 0; i < testTables.size(); i++)
for(i = 0; i < testTables.size(); i++)
delete testTables[i];
testTables.clear();
for(size_t i = 0; i < testResults.size(); i++)
for(i = 0; i < testResults.size(); i++)
delete testResults[i];
testResults.clear();
@@ -498,7 +498,8 @@ void NDBT_TestCaseImpl1::waitSteps(){
waitThreadsMutexPtr);
unsigned completedSteps = 0;
for(unsigned i=0; i<steps.size(); i++){
unsigned i;
for(i=0; i<steps.size(); i++){
if (results[i] != NORESULT){
completedSteps++;
if (results[i] == NDBT_OK)
@@ -512,7 +513,7 @@ void NDBT_TestCaseImpl1::waitSteps(){
NdbMutex_Unlock(waitThreadsMutexPtr);
void *status;
for(unsigned i=0; i<steps.size();i++){
for(i=0; i<steps.size();i++){
NdbThread_WaitFor(threads[i], &status);
NdbThread_Destroy(&threads[i]);
}
@@ -644,12 +645,12 @@ int NDBT_TestCaseImpl1::runSteps(NDBT_Context* ctx){
numStepsOk = 0;
numStepsFail = 0;
numStepsCompleted = 0;
for (unsigned i = 0; i < steps.size(); i++)
unsigned i;
for (i = 0; i < steps.size(); i++)
startStepInThread(i, ctx);
waitSteps();
for(unsigned i = 0; i < steps.size(); i++)
for(i = 0; i < steps.size(); i++)
if (results[i] != NDBT_OK)
res = NDBT_FAILED;
return res;
@@ -1104,20 +1105,20 @@ void NDBT_TestCaseImpl1::print(){
abort();
}
}
for(unsigned i=0; i<initializers.size(); i++){
unsigned i;
for(i=0; i<initializers.size(); i++){
ndbout << "Initializers[" << i << "]: " << endl;
initializers[i]->print();
}
for(unsigned i=0; i<steps.size(); i++){
for(i=0; i<steps.size(); i++){
ndbout << "Step[" << i << "]: " << endl;
steps[i]->print();
}
for(unsigned i=0; i<verifiers.size(); i++){
for(i=0; i<verifiers.size(); i++){
ndbout << "Verifier[" << i << "]: " << endl;
verifiers[i]->print();
}
for(unsigned i=0; i<finalizers.size(); i++){
for(i=0; i<finalizers.size(); i++){
ndbout << "Finalizer[" << i << "]: " << endl;
finalizers[i]->print();
}
@@ -1129,6 +1130,12 @@ void NDBT_Step::print(){
}
template class Vector<NDBT_TestCase*>;
template class Vector<NDBT_TestCaseResult*>;
template class Vector<NDBT_Step*>;
template class Vector<NdbThread*>;
template class Vector<NDBT_Verifier*>;
template class Vector<NDBT_Initializer*>;
template class Vector<NDBT_Finalizer*>;
template class Vector<const NdbDictionary::Table*>;
template class Vector<int>;