From: magnus.blaudd
Date: May 8 2012 9:22am
Subject: bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:3915 to 3916)
 Bug#14010507
List-Archive: http://lists.mysql.com/commits/143755
X-Bug: 14010507
Message-Id: <201205080922.q489Mmsa032234@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3916 magnus.blaudd@stripped	2012-05-08
      BUG#14010507 NDBSCANFILTER CLASS MISSING IN LIBNDBCLIENT.SO.6.0.0
       - Add reference to NdbScanFilter to dummy.cpp

    modified:
      storage/ndb/src/dummy.cpp
 3915 Ole John Aske	2012-05-08
      Fix for Bug#14010406 LARGE PUSHED JOIN HIT ASSERT IN SPJ BLOCK
      
      Buffered rows (caused by PARENT refs) was prematurely
      released when there was no TN_ACTIVE treeNodes childs.
      
      However, in bushy scans, a scan branch can be 'repeated'
      even if its previous execution was not 'ACTIVE'
      
      Thus, the logic for when buffered row should be released should be
      less eager to release rows. Now we keep any buffered rows until
      we prepare the treeNodes to retrieve new rows for the specific treeNode.
      
      This also made it possible to simplify this logic such that the
      recursive method Dbspj::cleanupChildBranch() became obsolete.
      
      As part of debugging / fixing this problem, SPJ-DEBUG trace was
      enhanced such that execution of SPJ signals are related
      to 'node_no' of treeNode and ident of the request it belongs to.

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
      storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
=== modified file 'storage/ndb/src/dummy.cpp'
--- a/storage/ndb/src/dummy.cpp	2011-09-19 09:26:01 +0000
+++ b/storage/ndb/src/dummy.cpp	2012-05-08 09:18:50 +0000
@@ -4,5 +4,6 @@ typedef void (Ndb_cluster_connection::* 
 
 NDB_EXPORT fptr functions[] = {
   (fptr)&Ndb_cluster_connection::set_name,
+  (fptr)&NdbScanFilter::isfalse,
   0
 };

No bundle (reason: useless for push emails).