From: Ole John Aske
Date: November 15 2011 1:57pm
Subject: bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3582 to 3583)
List-Archive: http://lists.mysql.com/commits/141985
Message-Id: <20111115135733.6B214234@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3583 Ole John Aske	2011-11-15
      Changed ndb_join_pushdown.test into an included file.
      Added the new test ndb_join_pushdown_default.test which include the a above
      file and run it with default set of switches.

    added:
      mysql-test/suite/ndb/t/ndb_join_pushdown_default.test
    renamed:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result => mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.test => mysql-test/suite/ndb/t/ndb_join_pushdown.inc
    modified:
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
 3582 Ole John Aske	2011-11-14 [merge]
      Merge mysql-5.1-telco-7.0 -> mysql-5.1-telco-7.0-spj-scan-scan

    added:
      sql/ndb_component.cc
      sql/ndb_component.h
      sql/ndb_util_thread.h
    modified:
      libmysqld/Makefile.am
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test
      sql/Makefile.am
      sql/ha_ndb_index_stat.cc
      sql/ha_ndb_index_stat.h
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      sql/ha_ndbcluster_cond.cc
      sql/ha_ndbcluster_cond.h
      storage/ndb/CMakeLists.txt
      storage/ndb/include/kernel/ndb_limits.h
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h
      storage/ndb/include/ndb_version.h.in
      storage/ndb/src/common/portlib/NdbThread.c
      storage/ndb/src/common/util/NdbPack.cpp
      storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
      storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
      storage/ndb/src/kernel/vm/DLFifoList.hpp
      storage/ndb/src/kernel/vm/DLHashTable.hpp
      storage/ndb/src/kernel/vm/GlobalData.hpp
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/src/kernel/vm/pc.hpp
      storage/ndb/test/ndbapi/flexAsynch.cpp
=== renamed file 'mysql-test/suite/ndb/r/ndb_join_pushdown.result' => 'mysql-test/suite/ndb/r/ndb_join_pushdown_default.result'
=== renamed file 'mysql-test/suite/ndb/t/ndb_join_pushdown.test' => 'mysql-test/suite/ndb/t/ndb_join_pushdown.inc'
--- a/mysql-test/suite/ndb/t/ndb_join_pushdown.test	2011-10-20 12:52:58 +0000
+++ b/mysql-test/suite/ndb/t/ndb_join_pushdown.inc	2011-11-15 13:57:10 +0000
@@ -1,5 +1,3 @@
--- source include/have_ndb.inc
-
 ########################################
 # Define two connections as we want DDL to use its own connection
 # in order to keep DDL statistics counting out of the way

=== added file 'mysql-test/suite/ndb/t/ndb_join_pushdown_default.test'
--- a/mysql-test/suite/ndb/t/ndb_join_pushdown_default.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_join_pushdown_default.test	2011-11-15 13:57:10 +0000
@@ -0,0 +1,7 @@
+#
+# Test of pushed joins, aka SPJ, or AQL.
+# (Runs with default set of switches)
+#
+
+--source include/have_ndb.inc
+--source ndb_join_pushdown.inc 

No bundle (reason: useless for push emails).