database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
joreland@mysql.com
2005-07-21 09:10:44 +02:00
parent 1ca398f6b9
commit a5c6ab3c22
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ndb/test/include/HugoOperations.hpp
View File

@@ -103,7 +103,7 @@ public:
NDBT_ResultRow& get_row(Uint32 idx) { return *rows[idx];}
int execute_async(Ndb*, ExecType, AbortOption = AbortOnError);
int execute_async(Ndb*, NdbTransaction::ExecType, NdbTransaction::AbortOption = NdbTransaction::AbortOnError);
int wait_async(Ndb*, int timeout = -1);
protected:
@@ -121,8 +121,8 @@ protected:
int m_async_reply;
int m_async_return;
friend void HugoOperations_async_callback(int, NdbConnection*, void*);
void callback(int res, NdbConnection*);
friend void HugoOperations_async_callback(int, NdbTransaction*, void*);
void callback(int res, NdbTransaction*);
};
#endif

4
ndb/test/ndbapi/testNdbApi.cpp
View File

@@ -1099,7 +1099,7 @@ int runBug_11133(NDBT_Context* ctx, NDBT_Step* step){
C2(hugoOps.execute_NoCommit(pNdb) == 0);
C2(hugoOps2.startTransaction(&ndb2) == 0);
C2(hugoOps2.pkWriteRecord(&ndb2, 0, 1) == 0);
C2(hugoOps2.execute_async(&ndb2, NoCommit) == 0);
C2(hugoOps2.execute_async(&ndb2, NdbTransaction::NoCommit) == 0);
C2(hugoOps.execute_Commit(pNdb) == 0);
C2(hugoOps2.wait_async(&ndb2) == 0);
C2(hugoOps.closeTransaction(pNdb) == 0);
@@ -1110,7 +1110,7 @@ int runBug_11133(NDBT_Context* ctx, NDBT_Step* step){
C2(hugoOps.execute_NoCommit(pNdb) == 0);
C2(hugoOps2.startTransaction(&ndb2) == 0);
C2(hugoOps2.pkWriteRecord(&ndb2, 0, 1) == 0);
C2(hugoOps2.execute_async(&ndb2, NoCommit) == 0);
C2(hugoOps2.execute_async(&ndb2, NdbTransaction::NoCommit) == 0);
C2(hugoOps.execute_Commit(pNdb) == 0);
C2(hugoOps2.wait_async(&ndb2) == 0);
C2(hugoOps.closeTransaction(pNdb) == 0);

9
ndb/test/src/HugoOperations.cpp
View File

@@ -409,13 +409,13 @@ int HugoOperations::execute_Rollback(Ndb* pNdb){
}
void
HugoOperations_async_callback(int res, NdbConnection* pCon, void* ho)
HugoOperations_async_callback(int res, NdbTransaction* pCon, void* ho)
{
((HugoOperations*)ho)->callback(res, pCon);
}
void
HugoOperations::callback(int res, NdbConnection* pCon)
HugoOperations::callback(int res, NdbTransaction* pCon)
{
assert(pCon == pTrans);
m_async_reply= 1;
@@ -423,7 +423,8 @@ HugoOperations::callback(int res, NdbConnection* pCon)
}
int
HugoOperations::execute_async(Ndb* pNdb, ExecType et, AbortOption eao){
HugoOperations::execute_async(Ndb* pNdb, NdbTransaction::ExecType et,
NdbTransaction::AbortOption eao){
m_async_reply= 0;
pTrans->executeAsynchPrepare(et,
@@ -591,7 +592,7 @@ int HugoOperations::compareRecordToCopy(int numRecords ){
void
HugoOperations::refresh() {
NdbConnection* t = getTransaction();
NdbTransaction * t = getTransaction();
if(t)
t->refresh();
}