Skip to content

M
MariaDB
Commit 12169431 authored by unknown's avatar unknown
Browse files
Options

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
parents c96a907c 3957f1bf
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
ndb/include/ndbapi/NdbOperation.hpp
View file @ 12169431
...@@ -113,6 +113,7 @@ public: ...@@ -113,6 +113,7 @@ public:
*/ */
virtual int readTuple(LockMode); virtual int readTuple(LockMode);
#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
/** /**
* Define the NdbOperation to be a standard operation of type readTuple. * Define the NdbOperation to be a standard operation of type readTuple.
* When calling NdbTransaction::execute, this operation * When calling NdbTransaction::execute, this operation
...@@ -122,7 +123,6 @@ public: ...@@ -122,7 +123,6 @@ public:
*/ */
virtual int readTuple(); virtual int readTuple();
#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
/** /**
* Define the NdbOperation to be a standard operation of type * Define the NdbOperation to be a standard operation of type
* readTupleExclusive. * readTupleExclusive.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7