From: Ole John Aske
Date: June 23 2011 7:00am
Subject: bzr commit into mysql-5.5-cluster-spj branch (ole.john.aske:3370)
List-Archive: http://lists.mysql.com/commits/139727
Message-Id: <20110623070011.935E8225@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.5-cluster-spj-take2/ based on revid:magnus.blaudd@stripped

 3370 Ole John Aske	2011-06-23 [merge]
      'push --overwrite' of initial merge of mysql-5.1-cluster-7.0-spj-scan-scan into mysql-5.5-cluster

    added:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.test
      sql/abstract_query_plan.cc
      sql/abstract_query_plan.h
      sql/ha_ndbcluster_push.cc
      sql/ha_ndbcluster_push.h
      storage/ndb/ndbapi-examples/ndbapi_multi_cursor/
      storage/ndb/ndbapi-examples/ndbapi_multi_cursor/main.cpp
      storage/ndb/test/tools/spj_performance_test.cpp
      storage/ndb/test/tools/spj_sanity_test.cpp
      storage/ndb/test/tools/test_spj.cpp
    modified:
      .bzr-mysql/default.conf
      libmysqld/CMakeLists.txt
      mysql-test/suite/ndb/my.cnf
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndb_blob.result
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/r/ndb_dbug_tc_select.result
      mysql-test/suite/ndb/r/ndb_gis.result
      mysql-test/suite/ndb/r/ndb_index.result
      mysql-test/suite/ndb/r/ndb_statistics.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test
      mysql-test/suite/ndb/t/ps_7ndb.test
      scripts/mysql_system_tables.sql
      sql/CMakeLists.txt
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_cond.cc
      sql/handler.cc
      sql/handler.h
      sql/ndb_thd_ndb.h
      sql/opt_range.h
      sql/share/errmsg-utf8.txt
      sql/sql_select.cc
      sql/sql_select.h
      storage/ndb/CMakeLists.txt
      storage/ndb/test/tools/Makefile.am

Diff too large for email (18030 lines, the limit is 10000).
No bundle (reason: revision is a merge).