diff options
| author | joreland@mysql.com <> | 2005-04-13 07:43:03 +0200 |
|---|---|---|
| committer | joreland@mysql.com <> | 2005-04-13 07:43:03 +0200 |
| commit | 210a1fe5cc4858c3f2540ece0a5a54dfca8d615c (patch) | |
| tree | 71aa2c8455646dc24d0f9073c54677facb1352cf /ndb/include | |
| parent | bd1c0ee2c071e8db24546c318df2fdf0003e9b70 (diff) | |
| parent | fd5b9f7ed7ef9b852752cc40f0b09a4883e787c4 (diff) | |
| download | mariadb-git-210a1fe5cc4858c3f2540ece0a5a54dfca8d615c.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/ndbapi/NdbScanOperation.hpp | 2 | ||||
| -rw-r--r-- | ndb/include/ndbapi/NdbTransaction.hpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ndb/include/ndbapi/NdbScanOperation.hpp b/ndb/include/ndbapi/NdbScanOperation.hpp index ef1bbcd185b..bf8f362cefc 100644 --- a/ndb/include/ndbapi/NdbScanOperation.hpp +++ b/ndb/include/ndbapi/NdbScanOperation.hpp @@ -139,7 +139,7 @@ public: /** * Close scan */ - void close(bool forceSend = false); + void close(bool forceSend = false, bool releaseOp = false); /** * Update current tuple diff --git a/ndb/include/ndbapi/NdbTransaction.hpp b/ndb/include/ndbapi/NdbTransaction.hpp index 50e4e766803..2e102b104d8 100644 --- a/ndb/include/ndbapi/NdbTransaction.hpp +++ b/ndb/include/ndbapi/NdbTransaction.hpp @@ -658,6 +658,7 @@ private: // Release all cursor operations in connection void releaseOps(NdbOperation*); void releaseScanOperations(NdbIndexScanOperation*); + void releaseExecutedScanOperation(NdbIndexScanOperation*); // Set the transaction identity of the transaction void setTransactionId(Uint64 aTransactionId); |