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

 4474 Ole John Aske	2011-08-22
      Fixed SPJ regression:
      
      After push of 'revno: 4448' to branch 'mysql-5.1-telco-7.0', the ndbapi test 
      'testSpj' started failing.
      
      This is a fix for the first of these problems ('testSpj -n scanJoin' still fails)
      which reverts part of the changes in revno 4448.
      
      The problem fixed - or rather compensated for - is that retrieving ATTR values
      from the receive buffer has the underlying assumption that the NdbReceiver
      refer the next row (or end of the current).
      
      Therefor this fix increment the 'current' row by using ::get_row instead of ::peek_row
      and remove a verifySortOrder from a place where the current row has been advanced, and
      before the fragment has been reorganized(). 

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 4473 Jan Wedvik	2011-08-22
      This commit fixes (hopefully) compiler warnings in previous commit.

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-08-22 08:35:35 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-08-22 12:20:15 +0000
@@ -431,8 +431,8 @@ public:
   const NdbReceiver& getReceiver() const
   { return m_receiver; }
 
-  const char* getCurrentRow() const
-  { return m_receiver.peek_row(); }
+  const char* getCurrentRow()
+  { return m_receiver.get_row(); }
 
   /**
    * Process an incomming tuple for this stream. Extract parent and own tuple 
@@ -3480,8 +3480,6 @@ NdbQueryImpl::OrderedFragSet::getCurrent
 { 
   if (m_ordering!=NdbQueryOptions::ScanOrdering_unordered)
   {
-    // Results should be ordered.
-    assert(verifySortOrder());
     /** 
      * Must have tuples for each (non-completed) fragment when doing ordered
      * scan.

No bundle (reason: useless for push emails).