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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
This commit is contained in:
tomas@poseidon.ndb.mysql.com 2004-12-23 16:05:22 +01:00
commit 9bece0dfc2

View file

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