Commit 570cfc8e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into  mysql.com:/home/jonas/src/mysql-5.0-push
parents 7f984b92 fa22e389

ndb/test/ndbapi/testNdbApi.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ int runBug_11133(NDBT_Context* ctx, NDBT_Step* step){ 
  C2(hugoOps.execute_Commit(pNdb) == 0);

  C2(hugoOps.closeTransaction(pNdb) == 0);



  Ndb ndb2("TEST_DB");

  Ndb ndb2(&ctx->m_cluster_connection, "TEST_DB");

  C2(ndb2.init() == 0);

  C2(ndb2.waitUntilReady() == 0);

  HugoOperations hugoOps2(*pTab);

ndb/test/src/HugoOperations.cpp

+3 −2
Original line number Diff line number Diff line
@@ -449,8 +449,9 @@ HugoOperations::wait_async(Ndb* pNdb, int timeout) 
  return -1;

}



HugoOperations::HugoOperations(const NdbDictionary::Table& _tab):

  UtilTransactions(_tab),

HugoOperations::HugoOperations(const NdbDictionary::Table& _tab,

			       const NdbDictionary::Index* idx):

  UtilTransactions(_tab, idx),

  calc(_tab)

{

}