From: Ole John Aske
Date: September 20 2011 10:50am
Subject: bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3561 to 3562)
List-Archive: http://lists.mysql.com/commits/140997
Message-Id: <20110920105003.6F0E1230@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3562 Ole John Aske	2011-09-20 [merge]
      merge mysql-5.1-telco-7.0 -> mysql-5.1-telco-7.0-spj-scan-scan

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 3561 jonas oreland	2011-09-19 [merge]
      ndb - merge 70 to 70-spj-scan-scan

    added:
      mysql-test/suite/ndb/t/ndb_index_stat_partitions-master.opt
    modified:
      mysql-test/suite/ndb/r/ndb_index_stat_partitions.result
      storage/ndb/include/mgmcommon/ConfigRetriever.hpp
      storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
      storage/ndb/src/mgmapi/mgmapi.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
      storage/ndb/test/ndbapi/testMgm.cpp
      storage/ndb/test/ndbapi/testNdbApi.cpp
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-09-15 21:00:03 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-09-20 10:49:34 +0000
@@ -498,7 +498,6 @@ public:
     const Uint32 internalOpNo = m_operation.getQueryOperationDef().getQueryOperationId();
 
     const bool complete = !((remainingScans >> internalOpNo) & 1);
-    assert(complete || isScanResult());    // Lookups should always be 'complete'
     return complete; 
   }
 
@@ -919,10 +918,11 @@ NdbResultStream::execTRANSID_AI(const Ui
 void
 NdbResultStream::prepareNextReceiveSet()
 {
-  assert (isScanQuery());
-
-  m_recv = (m_recv+1) % 2;  // Receive into next ResultSet
-  assert(m_recv != m_read);
+  if (isScanQuery())          // Doublebuffered ResultSet[] if isScanQuery()
+  {
+    m_recv = (m_recv+1) % 2;  // Receive into next ResultSet
+    assert(m_recv != m_read);
+  }
 
   m_resultSets[m_recv].prepareReceive(m_receiver);
 
@@ -950,7 +950,6 @@ bool 
 NdbResultStream::prepareResultSet(Uint32 remainingScans)
 {
   bool isComplete = isSubScanComplete(remainingScans); //Childs with more rows
-  assert(isComplete || isScanResult());                //Lookups always 'complete'
 
   /**
    * Prepare NdbResultSet for reading - either the next
@@ -1161,7 +1160,7 @@ NdbRootFragment::NdbRootFragment():
   m_availResultSets(0),
   m_outstandingResults(0),
   m_confReceived(false),
-  m_remainingScans(0),
+  m_remainingScans(0xffffffff),
   m_idMapHead(-1),
   m_idMapNext(-1)
 {

No bundle (reason: useless for push emails).