bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (ole.john.aske:3270)

[Ole John Aske]

#At file:///export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:jonas@stripped

 3270 Ole John Aske	2010-09-06
      Removed an incorrect assert in SPJ result handling code.
      
      If the query is 'bush query' where some branches in the 'bush' is an outer join,
      these brances may be in 'm_iterState == Iter_finished' when an NULL row is 
      being produced as part of the outer join.
      
      Testcase to follow in next commit.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2010-09-03 13:13:16 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2010-09-06 08:10:02 +0000
@@ -724,7 +724,6 @@ NdbResultStream::getNextScanRow(Uint16 p
     m_currentParentId = parentId;
     m_iterState = Iter_notStarted;
   }        
-  assert(m_iterState != Iter_finished);
 
   /* Loop until we either find a suitable set of rows for this operation
    * and its descendants, or until we decide that there are no more matches


Attachment: [text/bzr-bundle] bzr/[e-mail]