From: Ole John Aske Date: August 18 2011 11:48am Subject: bzr push into mysql-5.1-telco-7.0 branch (ole.john.aske:4468 to 4469) List-Archive: http://lists.mysql.com/commits/140704 Message-Id: <20110818114803.6D77C218@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4469 Ole John Aske 2011-08-18 SPJ: Disallow copy and assignment of NdbRootFragment objects modified: storage/ndb/src/ndbapi/NdbQueryOperation.cpp 4468 Ole John Aske 2011-08-17 SPJ: Rename of class OrderedFragSet member fields m_emptiedFragCount & m_emptiedFrags to m_fetchMoreFragCount & m_fetchMoreFrags. modified: storage/ndb/src/ndbapi/NdbQueryOperation.cpp storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp === modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp' --- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp 2011-08-17 13:16:22 +0000 +++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp 2011-08-18 11:47:22 +0000 @@ -267,6 +267,10 @@ public: void postFetchRelease(); private: + /** No copying.*/ + NdbRootFragment(const NdbRootFragment&); + NdbRootFragment& operator=(const NdbRootFragment&); + STATIC_CONST( voidFragNo = 0xffffffff); /** Enclosing query.*/ No bundle (reason: useless for push emails).