From: Ole John Aske
Date: August 15 2011 12:19pm
Subject: bzr push into mysql-5.1-telco-7.0 branch (ole.john.aske:4447 to 4448)
List-Archive: http://lists.mysql.com/commits/140621
Message-Id: <20110815121946.E6D05218@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4448 Ole John Aske	2011-08-15
      SPJ: Fixed 'of by one' bug in ::verifySortOrder() which caused
      the last element m_activeFrags[] to not be verified.
      
      Also fixed ::fetchRow to used not advance the current row in
      NdbReceiver which would cause the above verifySortOrder to fail.
      
      NOTE: All NdbReceiver navigation in NdbQueryOperation use random
      access to the received rows due to parent / child correlated 
      results and therefore does not need ::get_row() which advance
      to the next row.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 4447 Frazer Clement	2011-07-11
      Remove unnecessary test config

    modified:
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.cnf
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-07-01 10:02:15 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-08-15 12:18:44 +0000
@@ -3302,9 +3302,9 @@ NdbQueryImpl::OrderedFragSet::getEmpty()
 bool 
 NdbQueryImpl::OrderedFragSet::verifySortOrder() const
 {
-  for(int i = 0; i<m_activeFragCount-2; i++)
+  for (int i = 0; i<m_activeFragCount-1; i++)
   {
-    if(compare(*m_activeFrags[i], *m_activeFrags[i+1]) < 0)
+    if (compare(*m_activeFrags[i], *m_activeFrags[i+1]) < 0)
     {
       assert(false);
       return false;
@@ -3736,7 +3736,7 @@ NdbQueryOperationImpl::nextResult(bool f
 void 
 NdbQueryOperationImpl::fetchRow(NdbResultStream& resultStream)
 {
-  const char* buff = resultStream.getReceiver().get_row();
+  const char* buff = resultStream.getReceiver().peek_row();
   assert(buff!=NULL || (m_firstRecAttr==NULL && m_ndbRecord==NULL));
 
   m_isRowNull = false;

No bundle (reason: useless for push emails).