diff options
author | unknown <knielsen@ymer.(none)> | 2007-04-25 15:31:05 +0200 |
---|---|---|
committer | unknown <knielsen@ymer.(none)> | 2007-04-25 15:31:05 +0200 |
commit | 806e35280ea353d4377ce5732c34f5932c0cf077 (patch) | |
tree | 52114e328c18a19bf7cccf2cbbb00e6bce2f3183 /ndb/include | |
parent | 9a9ff1501264f2cf2394cd2add04549b9e121710 (diff) | |
parent | 2399e1c994c3b2fbdea89be41fe2ac2225da1e8d (diff) | |
download | mariadb-git-806e35280ea353d4377ce5732c34f5932c0cf077.tar.gz |
Merge ymer.(none):/usr/local/mysql/mysql-5.0-telco-gca
into ymer.(none):/usr/local/mysql/mysql-5.0-ndb
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
Diffstat (limited to 'ndb/include')
-rw-r--r-- | ndb/include/ndbapi/NdbTransaction.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ndb/include/ndbapi/NdbTransaction.hpp b/ndb/include/ndbapi/NdbTransaction.hpp index d3405633f80..966872755ca 100644 --- a/ndb/include/ndbapi/NdbTransaction.hpp +++ b/ndb/include/ndbapi/NdbTransaction.hpp @@ -379,14 +379,16 @@ public: void executeAsynch(ExecType aTypeOfExec, NdbAsynchCallback aCallback, void* anyObject, - AbortOption abortOption = AbortOnError); + AbortOption abortOption = AbortOnError, + int forceSend= 0); #ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED void executeAsynch(::ExecType aTypeOfExec, NdbAsynchCallback aCallback, void* anyObject, - ::AbortOption abortOption= ::AbortOnError) + ::AbortOption abortOption= ::AbortOnError, + int forceSend= 0) { executeAsynch((ExecType)aTypeOfExec, aCallback, anyObject, - (AbortOption)abortOption); } + (AbortOption)abortOption, forceSend); } #endif #endif /** |