From: Ole John Aske
Date: April 23 2012 6:40am
Subject: bzr push into mysql-5.5-cluster-7.2 branch (ole.john.aske:3894 to 3895)
List-Archive: http://lists.mysql.com/commits/143600
Message-Id: <20120423064015.BA6E3241@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3895 Ole John Aske	2012-04-23
      Reverted incorrect change of 'tree_name' caused by previous merge from ...7.2-spj

    modified:
      .bzr-mysql/default.conf
 3894 Ole John Aske	2012-04-20 [merge]
      Merged SPJ fixes from branch mysql-5.5-cluster-7.2-spj -> cluster-7.2
      
      These fixes covers:
      
       - Native support of sorted-scan-scan queries in SPJ block
         (Avoid changing query plan to use tempfile + filesort, required by WL5940)
         This is alreay a part of what is reviewed for WL5940.
       - Improved SPJ block error handling, incl. ERROR_INSERTs for testing
       - Added tests to ndb_join_pushdown to check that queries with 
         user defined partitions are not pushed.

    modified:
      .bzr-mysql/default.conf
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
      sql/abstract_query_plan.cc
      sql/abstract_query_plan.h
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_push.cc
      sql/ha_ndbcluster_push.h
      sql/handler.h
      sql/sql_select.cc
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/test/CMakeLists.txt
      storage/ndb/test/ndbapi/testSpj.cpp
      storage/ndb/test/tools/spj_sanity_test.cpp
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2012-03-30 12:40:48 +0000
+++ b/.bzr-mysql/default.conf	2012-04-23 06:39:45 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-5.5-cluster-7.2-spj"
+tree_name = "mysql-5.5-cluster-7.2"

No bundle (reason: useless for push emails).