mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  mysql.com:/home/jonas/src/mysql-5.0-push
This commit is contained in:
unknown 2005-07-20 16:10:41 +02:00
commit 570cfc8ecb
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ndb/test/ndbapi/testNdbApi.cpp
View file

@ -1089,7 +1089,7 @@ int runBug_11133(NDBT_Context* ctx, NDBT_Step* step){
C2(hugoOps.execute_Commit(pNdb) == 0); C2(hugoOps.execute_Commit(pNdb) == 0);
C2(hugoOps.closeTransaction(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.init() == 0);
C2(ndb2.waitUntilReady() == 0); C2(ndb2.waitUntilReady() == 0);
HugoOperations hugoOps2(*pTab); HugoOperations hugoOps2(*pTab);

5
ndb/test/src/HugoOperations.cpp
View file

@ -449,8 +449,9 @@ HugoOperations::wait_async(Ndb* pNdb, int timeout)
return -1; return -1;
} }
HugoOperations::HugoOperations(const NdbDictionary::Table& _tab): HugoOperations::HugoOperations(const NdbDictionary::Table& _tab,
UtilTransactions(_tab), const NdbDictionary::Index* idx):
UtilTransactions(_tab, idx),
calc(_tab) calc(_tab)
{ {
} }