Commit cd3b9f57 authored by unknown's avatar unknown
Browse files

ndb compile warnings 


ndb/test/include/NDBT_Test.hpp:
  compile warnings
ndb/test/ndbapi/bank/BankLoad.cpp:
  compile warnings
ndb/test/ndbapi/testOIBasic.cpp:
  compile warnings
ndb/test/src/HugoCalculator.cpp:
  compile warnings
ndb/test/src/NDBT_Test.cpp:
  compile warnings
ndb/test/src/NdbBackup.cpp:
  compile warnings
ndb/test/src/NdbRestarts.cpp:
  compile warnings
parent 53e0c172

ndb/test/include/NDBT_Test.hpp

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ C##suitname():NDBT_TestSuite(#suitname){ \ 
  pt->addTable(tableName, false);



#define NDBT_TESTSUITE_END(suitname) \

 } } ; C##suitname suitname;

 } } ; C##suitname suitname



// Helper functions for retrieving variables from NDBT_Step

#define GETNDB(ps) ((NDBT_NdbApiStep*)ps)->getNdb()

ndb/test/ndbapi/bank/BankLoad.cpp

+2 −2
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ int Bank::loadGl(){ 
    

  m_ndb.closeTransaction(pTrans);      

  return NDBT_OK;

}; 

} 





int Bank::getBalanceForAccountType(const Uint32 accountType,
@@ -459,7 +459,7 @@ int Bank::loadAccountType(){ 
    

  m_ndb.closeTransaction(pTrans);      

  return NDBT_OK;

};

}

  

/**

 * Load ACCOUNT table

ndb/test/ndbapi/testOIBasic.cpp

+5 −5
Original line number Diff line number Diff line
@@ -3127,7 +3127,7 @@ pkinsert(Par par) 
  }

  con.closeTransaction();

  return 0;

};

}



static int

pkupdate(Par par)
@@ -3183,7 +3183,7 @@ pkupdate(Par par) 
  }

  con.closeTransaction();

  return 0;

};

}



static int

pkdelete(Par par)
@@ -3235,7 +3235,7 @@ pkdelete(Par par) 
  }

  con.closeTransaction();

  return 0;

};

}



static int

pkread(Par par)
@@ -3349,7 +3349,7 @@ hashindexupdate(Par par, const ITab& itab) 
  }

  con.closeTransaction();

  return 0;

};

}



static int

hashindexdelete(Par par, const ITab& itab)
@@ -3400,7 +3400,7 @@ hashindexdelete(Par par, const ITab& itab) 
  }

  con.closeTransaction();

  return 0;

};

}



static int

hashindexread(Par par, const ITab& itab)

ndb/test/src/HugoCalculator.cpp

+3 −5
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ HugoCalculator::HugoCalculator(const NdbDictionary::Table& tab) : m_tab(tab) { 
#endif

  // Check that idCol is not conflicting with updatesCol

  assert(m_idCol != m_updatesCol && m_idCol != -1 && m_updatesCol != -1);

};

}



Int32

HugoCalculator::calcValue(int record,
@@ -74,7 +74,7 @@ HugoCalculator::calcValue(int record, 
  else

    val = record + attrib + updates;

  return val;

};

}

#if 0

HugoCalculator::U_Int32 calcValue(int record, int attrib, int updates) const;

HugoCalculator::U_Int64 calcValue(int record, int attrib, int updates) const;
@@ -109,8 +109,6 @@ HugoCalculator::calcValue(int record, 
    

    // Calculate length of the string to create. We want the string 

    // length to be varied between max and min of this attribute.

    Uint32 org = len;



    if(attr->getType() == NdbDictionary::Column::Varchar)

      len = val % (len + 1);

    else
@@ -137,7 +135,7 @@ HugoCalculator::calcValue(int record, 
    }

  }

  return buf;

}; 

} 



int

HugoCalculator::verifyRowValues(NDBT_ResultRow* const  pRow) const{

ndb/test/src/NDBT_Test.cpp

+1 −2
Original line number Diff line number Diff line
@@ -617,8 +617,7 @@ int NDBT_TestCase::execute(NDBT_Context* ctx){ 
	   << endl;

  }

  return res;

};



}



void NDBT_TestCase::startTimer(NDBT_Context* ctx){

  timer.doStart();