List:Commits« Previous MessageNext Message »
From:Ole John Aske Date:September 27 2010 6:59am
Subject:bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
(ole.john.aske:3292)
View as plain text  
#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:ole.john.aske@stripped

 3292 Ole John Aske	2010-09-27
      spj-svs: Cleanup after http://lists.mysql.com/commits/118668. 
      
      Removed / changed some asserts regarding NdbResultStream::m_iterState 
      which no longer was correct.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2010-09-23 09:17:21 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2010-09-27 06:59:24 +0000
@@ -441,7 +441,7 @@ private:
 
 NdbResultStream::NdbResultStream(NdbQueryOperationImpl& operation, Uint32 rootFragNo):
   m_rootFragNo(rootFragNo),
-  m_receiver(operation.getQuery().getNdbTransaction().getNdb(), &operation),  // FIXME? Use Ndb recycle lists
+  m_receiver(operation.getQuery().getNdbTransaction().getNdb(), &operation),
   m_maxRows(0),
   m_rowCount(0),
   m_operation(operation),
@@ -689,8 +689,7 @@ NdbResultStream::nextResult()
 void
 NdbResultStream::execTRANSID_AI(const Uint32 *ptr, Uint32 len)
 {
-  assert(m_iterState == Iter_notStarted ||
-         !m_operation.getQueryOperationDef().isScanOperation());
+  assert(m_iterState == Iter_notStarted);
   if (m_operation.getQueryDef().isScanQuery())
   {
     const CorrelationData correlData(ptr, len);
@@ -733,9 +732,6 @@ NdbResultStream::execTRANSID_AI(const Ui
 void 
 NdbResultStream::handleBatchComplete()
 {
-  assert(m_iterState == Iter_notStarted || m_iterState == Iter_finished ||
-         !m_operation.getQueryOperationDef().isScanOperation());
-
   for (Uint32 tupleNo=0; tupleNo<getRowCount(); tupleNo++)
   {
     m_tupleSet[tupleNo].m_skip = false;


Attachment: [text/bzr-bundle] bzr/ole.john.aske@sun.com-20100927065924-ipt7e8dmshsmco5h.bundle
Thread
bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch(ole.john.aske:3292) Ole John Aske27 Sep