diff options
author | unknown <joreland@mysql.com> | 2005-07-20 16:09:22 +0200 |
---|---|---|
committer | unknown <joreland@mysql.com> | 2005-07-20 16:09:22 +0200 |
commit | fa22e3898225716b02c538d03e4c043d2df3e377 (patch) | |
tree | 9138ddd7f2a180c2706b2035581218b816dd103f /ndb | |
parent | 6708dbdbf2af65bdfa8d42895f3d54bcdcd150fc (diff) | |
download | mariadb-git-fa22e3898225716b02c538d03e4c043d2df3e377.tar.gz |
merge
Diffstat (limited to 'ndb')
-rw-r--r-- | ndb/test/ndbapi/testNdbApi.cpp | 2 | ||||
-rw-r--r-- | ndb/test/src/HugoOperations.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ndb/test/ndbapi/testNdbApi.cpp b/ndb/test/ndbapi/testNdbApi.cpp index 8a66c120b51..7ed86a56ad1 100644 --- a/ndb/test/ndbapi/testNdbApi.cpp +++ b/ndb/test/ndbapi/testNdbApi.cpp @@ -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); diff --git a/ndb/test/src/HugoOperations.cpp b/ndb/test/src/HugoOperations.cpp index ff9e0b5ad21..6b988497e94 100644 --- a/ndb/test/src/HugoOperations.cpp +++ b/ndb/test/src/HugoOperations.cpp @@ -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) { } |