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

Irix64 mipspro ndb compile fixes

This commit is contained in:
mysqldev@o2k.irixworld.net
2004-07-09 15:10:24 +02:00
parent 63fca63e58
commit cba5218a1d
7 changed files with 51 additions and 42 deletions

View File

@@ -336,24 +336,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();
@@ -487,7 +487,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)
@@ -501,7 +502,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]);
}
@@ -633,12 +634,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;
@@ -1091,20 +1092,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();
}