database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge ymer.(none):/usr/local/mysql/mysql-5.0-telco-gca

Browse Source 
into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Manual merge.
This commit is contained in:
unknown
2007-04-25 15:18:34 +02:00
parent 21fe947986 2399e1c994
commit 4ea948c5c9
4 changed files with 94 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/ndb/include/ndbapi/NdbTransaction.hpp
View File

@ -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
/**