From: Ole John Aske
Date: June 30 2011 12:49pm
Subject: bzr push into mysql-trunk-cluster branch (ole.john.aske:3329 to 3330)
List-Archive: http://lists.mysql.com/commits/140111
Message-Id: <20110630124921.CC071225@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3330 magnus.blaudd@stripped	2011-06-28 [merge]
      Merge 5.5-cluster(revno: 3374) into trunk-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:
      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/share/errmsg-utf8.txt
      sql/sql_select.cc
      sql/sql_select.h
      storage/ndb/CMakeLists.txt
      storage/ndb/test/tools/Makefile.am
 3329 magnus.blaudd@stripped	2011-06-27
      Bug #12664797 PFS_UPGRADE.RESULT LINE NUMBER DIFF WHEN MYSQL_SYSTEM_TABLES.SQL MODIFIED
       - Update line numbers after adding more SQL to mysql_system_tables.sql

    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade.result

Diff too large for email (18472 lines, the limit is 10000).
No bundle (reason: useless for push emails).