From: Ole John Aske Date: January 27 2012 9:05am Subject: bzr push into mysql-trunk-cluster branch (ole.john.aske:3428 to 3429) Bug#13529048 List-Archive: http://lists.mysql.com/commits/142598 X-Bug: 13529048 Message-Id: <20120127090525.72A34235@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3429 Ole John Aske 2012-01-27 Accept new *.result for ndb_join_pushdown_*.test caused by merging fix for bug#13529048 into mysq-trunk-cluster modified: mysql-test/suite/ndb/r/ndb_join_pushdown_default.result mysql-test/suite/ndb/r/ndb_join_pushdown_nobnl.result mysql-test/suite/ndb/r/ndb_join_pushdown_none.result 3428 Ole John Aske 2012-01-26 [merge] Merge of mysql-5.5-cluster + mysql-trunk into mysql-trunk-cluster Removed MCP_BUG#13330645 after a fix for this bug has been pushed to mysql-trunk. removed: mysql-test/suite/innodb/r/innodb_bug12400341.result mysql-test/suite/innodb/t/innodb_bug12400341-master.opt mysql-test/suite/innodb/t/innodb_bug12400341.test added: include/byteorder/ include/byteorder/big_endian.h include/byteorder/byte_order_generic.h include/byteorder/byte_order_generic_x86.h include/byteorder/byte_order_generic_x86_64.h include/byteorder/little_endian.h include/my_byteorder.h mysql-test/r/mysqlimport.result mysql-test/suite/innodb/r/innodb_bug12400341.result mysql-test/suite/innodb/t/innodb_bug12400341-master.opt mysql-test/suite/innodb/t/innodb_bug12400341.test mysql-test/suite/ndb/r/ndb_bug13563280.result mysql-test/suite/ndb/t/ndb_bug13563280.test mysql-test/suite/ndb_rpl/t/show_mysqld_warnings.inc mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result mysql-test/suite/sys_vars/r/innodb_doublewrite_batch_size_basic.result mysql-test/suite/sys_vars/r/innodb_page_hash_locks_basic.result mysql-test/suite/sys_vars/r/innodb_trx_rseg_n_slots_debug_basic.result mysql-test/suite/sys_vars/r/stored_program_cache_basic.result mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test mysql-test/suite/sys_vars/t/innodb_doublewrite_batch_size_basic.test mysql-test/suite/sys_vars/t/innodb_page_hash_locks_basic.test mysql-test/suite/sys_vars/t/innodb_trx_rseg_n_slots_debug_basic.test mysql-test/suite/sys_vars/t/stored_program_cache_basic.test mysql-test/t/mysqlimport.test sql/ndb_repl_tab.cc sql/ndb_repl_tab.h storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/StressTest.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImplForNdbRecord.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordBlobImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordOperationImpl.java storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/StressTest.java storage/ndb/src/kernel/vm/CountingPool.cpp storage/ndb/src/kernel/vm/CountingPool.hpp unittest/gunit/alignment-t.cc unittest/gunit/byteorder-t.cc renamed: mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_basic.result mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_basic.test mysql-test/suite/sys_vars/r/innodb_sort_buf_size_basic.result => mysql-test/suite/sys_vars/r/innodb_sort_buffer_size_basic.result mysql-test/suite/sys_vars/t/innodb_sort_buf_size_basic.test => mysql-test/suite/sys_vars/t/innodb_sort_buffer_size_basic.test modified: BUILD/build_mccge.sh CMakeLists.txt VERSION client/mysql.cc client/mysql_upgrade.c client/mysqladmin.cc client/mysqlbinlog.cc client/mysqlcheck.c client/mysqldump.c client/mysqlimport.c client/mysqlshow.c client/mysqlslap.c cmake/build_configurations/mysql_release.cmake cmd-line-utils/libedit/chartype.h cmd-line-utils/libedit/eln.c cmd-line-utils/libedit/readline.c config.h.cmake include/CMakeLists.txt include/m_ctype.h include/my_getopt.h include/my_global.h include/mysql/psi/mysql_socket.h include/mysql/psi/mysql_table.h include/mysql/psi/mysql_thread.h include/mysql/psi/psi.h include/mysql/psi/psi_abi_v0.h.pp include/mysql/psi/psi_abi_v1.h.pp include/mysql/psi/psi_abi_v2.h.pp libmysqld/emb_qcache.cc mysql-test/collections/default.experimental mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/extra/rpl_tests/rpl_start_stop_slave.test mysql-test/include/have_example_plugin.inc mysql-test/include/have_semisync_plugin.inc mysql-test/include/have_simple_parser.inc mysql-test/include/have_udf.inc mysql-test/include/order_by.inc mysql-test/include/range.inc mysql-test/include/show_slave_status.inc mysql-test/include/subquery_mat.inc mysql-test/include/subquery_sj.inc mysql-test/include/wait_for_ndb_to_binlog.inc mysql-test/mysql-test-run.pl mysql-test/r/archive_gis.result mysql-test/r/bigint.result mysql-test/r/case.result mysql-test/r/ctype_many.result mysql-test/r/ctype_utf8.result mysql-test/r/date_formats.result mysql-test/r/distinct.result mysql-test/r/func_if.result mysql-test/r/func_in_icp.result mysql-test/r/func_in_icp_mrr.result mysql-test/r/func_in_mrr.result mysql-test/r/func_in_mrr_cost.result mysql-test/r/func_in_none.result mysql-test/r/func_set.result mysql-test/r/func_str.result mysql-test/r/func_time.result mysql-test/r/gis.result mysql-test/r/group_by.result mysql-test/r/having.result mysql-test/r/innodb_explain_non_select_all.result mysql-test/r/innodb_icp.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_icp_none.result mysql-test/r/innodb_mrr.result mysql-test/r/innodb_mrr_all.result mysql-test/r/innodb_mrr_cost.result mysql-test/r/innodb_mrr_cost_all.result mysql-test/r/innodb_mrr_cost_icp.result mysql-test/r/innodb_mrr_icp.result mysql-test/r/innodb_mrr_none.result mysql-test/r/join.result mysql-test/r/join_outer.result mysql-test/r/join_outer_bka.result mysql-test/r/join_outer_bka_nixbnl.result mysql-test/r/key_cache.result mysql-test/r/log_tables_upgrade.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_all.result mysql-test/r/myisam_icp_none.result mysql-test/r/myisampack.result mysql-test/r/mysql.result mysql-test/r/mysql_upgrade.result mysql-test/r/mysql_upgrade_ssl.result mysql-test/r/mysqladmin.result mysql-test/r/mysqlbinlog.result mysql-test/r/mysqlcheck.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqldump.result mysql-test/r/mysqlshow.result mysql-test/r/mysqlslap.result mysql-test/r/optimizer_debug_sync.result mysql-test/r/order_by_icp_mrr.result mysql-test/r/order_by_none.result mysql-test/r/partition.result mysql-test/r/partition_binlog_stmt.result mysql-test/r/partition_explicit_prune.result mysql-test/r/partition_key_cache.result mysql-test/r/plugin.result mysql-test/r/plugin_auth.result mysql-test/r/plugin_auth_qa_1.result mysql-test/r/plugin_auth_qa_2.result mysql-test/r/plugin_auth_qa_3.result mysql-test/r/range_all.result mysql-test/r/range_icp.result mysql-test/r/range_icp_mrr.result mysql-test/r/range_mrr.result mysql-test/r/range_mrr_cost.result mysql-test/r/range_none.result mysql-test/r/select_all_bka.result mysql-test/r/select_all_bka_nixbnl.result mysql-test/r/subquery_mat.result mysql-test/r/subquery_mat_all.result mysql-test/r/subquery_mat_none.result mysql-test/r/subquery_sj_all.result mysql-test/r/subquery_sj_all_bka.result mysql-test/r/subquery_sj_all_bka_nixbnl.result mysql-test/r/subquery_sj_all_bkaunique.result mysql-test/r/subquery_sj_dupsweed.result mysql-test/r/subquery_sj_dupsweed_bka.result mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result mysql-test/r/subquery_sj_dupsweed_bkaunique.result mysql-test/r/subquery_sj_firstmatch.result mysql-test/r/subquery_sj_firstmatch_bka.result mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result mysql-test/r/subquery_sj_firstmatch_bkaunique.result mysql-test/r/subquery_sj_loosescan.result mysql-test/r/subquery_sj_loosescan_bka.result mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result mysql-test/r/subquery_sj_loosescan_bkaunique.result mysql-test/r/subquery_sj_mat.result mysql-test/r/subquery_sj_mat_bka.result mysql-test/r/subquery_sj_mat_bka_nixbnl.result mysql-test/r/subquery_sj_mat_bkaunique.result mysql-test/r/subquery_sj_mat_nosj.result mysql-test/r/subquery_sj_none.result mysql-test/r/subquery_sj_none_bka.result mysql-test/r/subquery_sj_none_bka_nixbnl.result mysql-test/r/subquery_sj_none_bkaunique.result mysql-test/r/temporal_literal.result mysql-test/r/type_date.result mysql-test/r/type_float.result mysql-test/r/type_temporal_fractional.result mysql-test/r/type_temporal_upgrade.result mysql-test/r/type_time.result mysql-test/r/user_var.result mysql-test/r/view.result mysql-test/r/view_alias.result mysql-test/r/xa.result mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test mysql-test/suite/engines/funcs/r/tc_rename_error.result mysql-test/suite/federated/federated_debug.result mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result mysql-test/suite/funcs_1/r/is_tables_mysql.result mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result mysql-test/suite/innodb/r/innodb_gis.result mysql-test/suite/innodb_fts/r/innodb_fts_large_records.result mysql-test/suite/innodb_fts/t/disabled.def mysql-test/suite/innodb_fts/t/innodb_fts_large_records.test mysql-test/suite/ndb/r/ndb_basic.result mysql-test/suite/ndb/r/ndb_column_properties.result mysql-test/suite/ndb/r/ndb_condition_pushdown.result mysql-test/suite/ndb/t/clusterj.test mysql-test/suite/ndb/t/ndb_basic.test mysql-test/suite/ndb/t/ndb_column_properties.test mysql-test/suite/ndb/t/ndb_condition_pushdown.test mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.test mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_error.test mysql-test/suite/opt_trace/include/general2.inc mysql-test/suite/opt_trace/r/filesort_pq.result mysql-test/suite/opt_trace/r/general2_no_prot.result mysql-test/suite/opt_trace/r/general2_ps_prot.result mysql-test/suite/opt_trace/r/subquery_no_prot.result mysql-test/suite/opt_trace/r/subquery_ps_prot.result mysql-test/suite/opt_trace/r/temp_table.result mysql-test/suite/parts/r/partition-dml-1-9-innodb.result mysql-test/suite/parts/r/partition-dml-1-9-myisam.result mysql-test/suite/perfschema/r/dml_handler.result mysql-test/suite/perfschema/r/innodb_table_io.result mysql-test/suite/perfschema/r/misc.result mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/r/temp_table_io.result mysql-test/suite/perfschema/t/dml_handler.test mysql-test/suite/perfschema/t/misc.test mysql-test/suite/rpl/r/rpl_heartbeat_basic.result mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_manual_change_index_file.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result mysql-test/suite/rpl/t/rpl_heartbeat_basic.test mysql-test/suite/rpl/t/rpl_log_pos.test mysql-test/suite/rpl/t/rpl_manual_change_index_file.test mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/character_sets_dir_basic.result mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result mysql-test/suite/sys_vars/r/plugin_dir_basic.result mysql-test/suite/sys_vars/t/all_vars.test mysql-test/suite/sys_vars/t/character_sets_dir_basic.test mysql-test/suite/sys_vars/t/disabled.def mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test mysql-test/t/bigint.test mysql-test/t/ctype_many.test mysql-test/t/ctype_utf8.test mysql-test/t/date_formats.test mysql-test/t/distinct.test mysql-test/t/func_set.test mysql-test/t/func_str.test mysql-test/t/func_time.test mysql-test/t/group_by.test mysql-test/t/having.test mysql-test/t/join.test mysql-test/t/join_outer.test mysql-test/t/key_cache.test mysql-test/t/myisampack.test mysql-test/t/mysql.test mysql-test/t/mysql_embedded.test mysql-test/t/mysql_upgrade.test mysql-test/t/mysqladmin.test mysql-test/t/mysqlbinlog.test mysql-test/t/mysqlcheck.test mysql-test/t/mysqldump.test mysql-test/t/mysqlshow.test mysql-test/t/mysqlslap.test mysql-test/t/optimizer_debug_sync.test mysql-test/t/partition.test mysql-test/t/partition_binlog_stmt.test mysql-test/t/partition_explicit_prune.test mysql-test/t/partition_key_cache.test mysql-test/t/plugin.test mysql-test/t/temporal_literal.test mysql-test/t/type_date.test mysql-test/t/type_float.test mysql-test/t/type_temporal_fractional.test mysql-test/t/type_temporal_upgrade.test mysql-test/t/type_time.test mysql-test/t/udf_skip_grants-master.opt mysql-test/t/user_var.test mysql-test/t/view.test mysql-test/t/xa.test mysys/charset-def.c mysys/default.c mysys/my_getopt.c mysys/psi_noop.c scripts/mysql_system_tables.sql scripts/mysqld_safe.sh scripts/mysqlhotcopy.sh sql/binlog.cc sql/debug_sync.cc sql/field.cc sql/field.h sql/field_conv.cc sql/filesort.cc sql/filesort_utils.h sql/ha_ndb_index_stat.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_binlog.h sql/ha_ndbcluster_cond.cc sql/ha_partition.cc sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_func.h sql/item_strfunc.h sql/item_subselect.cc sql/item_sum.cc sql/item_timefunc.cc sql/log_event.cc sql/mysqld.cc sql/mysqld.h sql/ndb_share.h sql/ndb_table_guard.h sql/ndb_thd.cc sql/opt_explain.cc sql/opt_range.cc sql/opt_sum.cc sql/records.cc sql/rpl_master.cc sql/rpl_slave.cc sql/share/errmsg-utf8.txt sql/sp_cache.cc sql/sp_cache.h sql/spatial.cc sql/sql_admin.cc sql/sql_base.cc sql/sql_db.cc sql/sql_executor.cc sql/sql_join_buffer.h sql/sql_lex.cc sql/sql_optimizer.cc sql/sql_parse.cc sql/sql_planner.cc sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_resolver.cc sql/sql_select.cc sql/sql_select.h sql/sql_table.cc sql/sql_tmp_table.cc sql/sql_udf.cc sql/sql_view.cc sql/sys_vars.cc sql/table.cc sql/table.h sql/unireg.cc storage/archive/ha_archive.cc storage/example/ha_example.cc storage/innobase/btr/btr0btr.cc storage/innobase/btr/btr0cur.cc storage/innobase/buf/buf0buf.cc storage/innobase/buf/buf0dblwr.cc storage/innobase/buf/buf0flu.cc storage/innobase/data/data0data.cc storage/innobase/dict/dict0boot.cc storage/innobase/dict/dict0crea.cc storage/innobase/dict/dict0dict.cc storage/innobase/dict/dict0load.cc storage/innobase/dict/dict0mem.cc storage/innobase/dict/dict0stats.cc storage/innobase/fil/fil0fil.cc storage/innobase/fts/fts0fts.cc storage/innobase/handler/ha_innodb.cc storage/innobase/handler/i_s.cc storage/innobase/ibuf/ibuf0ibuf.cc storage/innobase/include/btr0btr.h storage/innobase/include/buf0flu.h storage/innobase/include/data0data.h storage/innobase/include/data0data.ic storage/innobase/include/dict0boot.h storage/innobase/include/dict0mem.h storage/innobase/include/dict0types.h storage/innobase/include/fil0fil.h storage/innobase/include/mtr0log.ic storage/innobase/include/os0sync.ic storage/innobase/include/sync0rw.ic storage/innobase/include/sync0sync.ic storage/innobase/include/trx0rseg.ic storage/innobase/include/trx0sys.h storage/innobase/lock/lock0lock.cc storage/innobase/os/os0file.cc storage/innobase/page/page0page.cc storage/innobase/pars/pars0pars.cc storage/innobase/row/row0ins.cc storage/innobase/row/row0merge.cc storage/innobase/row/row0mysql.cc storage/innobase/row/row0sel.cc storage/innobase/row/row0umod.cc storage/innobase/row/row0upd.cc storage/innobase/srv/srv0srv.cc storage/innobase/srv/srv0start.cc storage/innobase/trx/trx0purge.cc storage/innobase/trx/trx0rec.cc storage/innobase/trx/trx0sys.cc storage/innobase/trx/trx0trx.cc storage/innobase/ut/ut0crc32.cc storage/myisam/mi_create.c storage/myisam/mi_preload.c storage/ndb/CMakeLists.txt storage/ndb/VERSION storage/ndb/clusterj/clusterj-api/pom.xml storage/ndb/clusterj/clusterj-bindings/pom.xml storage/ndb/clusterj/clusterj-core/pom.xml storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainFieldHandlerImpl.java storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Operation.java storage/ndb/clusterj/clusterj-jdbc/pom.xml storage/ndb/clusterj/clusterj-jpatest/pom.xml storage/ndb/clusterj/clusterj-openjpa/pom.xml storage/ndb/clusterj/clusterj-test/pom.xml storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicObjectTest.java storage/ndb/clusterj/clusterj-test/src/main/resources/schema.sql storage/ndb/clusterj/clusterj-tie/pom.xml storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/BlobImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionServiceImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterTransactionImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ColumnImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DictionaryImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/OperationImpl.java storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java storage/ndb/clusterj/clusterj-tie/src/main/resources/com/mysql/clusterj/tie/Bundle.properties storage/ndb/clusterj/pom.xml storage/ndb/include/debugger/SignalLoggerManager.hpp storage/ndb/include/kernel/GlobalSignalNumbers.h storage/ndb/include/kernel/NodeInfo.hpp storage/ndb/include/kernel/ndb_limits.h storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp storage/ndb/include/kernel/signaldata/EnableCom.hpp storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp storage/ndb/include/ndb_global.h storage/ndb/include/ndb_types.h.in storage/ndb/include/ndbapi/Ndb.hpp storage/ndb/include/ndbapi/NdbDictionary.hpp storage/ndb/include/ndbapi/NdbOperation.hpp storage/ndb/include/ndbapi/NdbScanOperation.hpp storage/ndb/include/transporter/TransporterCallback.hpp storage/ndb/include/transporter/TransporterDefinitions.hpp storage/ndb/include/transporter/TransporterRegistry.hpp storage/ndb/memcache/src/ClusterConnectionPool.cc storage/ndb/memcache/src/schedulers/S_sched.cc storage/ndb/memcache/unit/test_workqueue.c storage/ndb/src/common/debugger/EventLogger.cpp storage/ndb/src/common/debugger/SignalLoggerManager.cpp storage/ndb/src/common/debugger/signaldata/SignalNames.cpp storage/ndb/src/common/transporter/Packer.cpp storage/ndb/src/common/transporter/TCP_Transporter.cpp storage/ndb/src/common/transporter/TCP_Transporter.hpp storage/ndb/src/common/transporter/TransporterRegistry.cpp storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.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/DblqhMain.cpp storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp storage/ndb/src/kernel/blocks/trpman.cpp storage/ndb/src/kernel/blocks/trpman.hpp storage/ndb/src/kernel/error/ErrorReporter.cpp storage/ndb/src/kernel/ndbd.cpp storage/ndb/src/kernel/vm/ArrayPool.hpp storage/ndb/src/kernel/vm/CMakeLists.txt storage/ndb/src/kernel/vm/Configuration.cpp storage/ndb/src/kernel/vm/Emulator.cpp storage/ndb/src/kernel/vm/Emulator.hpp storage/ndb/src/kernel/vm/GlobalData.hpp storage/ndb/src/kernel/vm/Pool.cpp storage/ndb/src/kernel/vm/Pool.hpp storage/ndb/src/kernel/vm/SectionReader.cpp storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp storage/ndb/src/kernel/vm/SimulatedBlock.cpp storage/ndb/src/kernel/vm/SimulatedBlock.hpp storage/ndb/src/kernel/vm/TransporterCallback.cpp storage/ndb/src/kernel/vm/TransporterCallbackKernel.hpp storage/ndb/src/kernel/vm/mt.cpp storage/ndb/src/kernel/vm/mt.hpp storage/ndb/src/kernel/vm/mt_thr_config.cpp storage/ndb/src/kernel/vm/mt_thr_config.hpp storage/ndb/src/mgmsrv/ConfigInfo.cpp storage/ndb/src/ndbapi/NdbDictionary.cpp storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp storage/ndb/src/ndbapi/TransporterFacade.cpp storage/ndb/src/ndbapi/TransporterFacade.hpp storage/ndb/src/ndbjtie/NdbApiWrapper.hpp storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb.java storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbDictionary.java storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperation.java storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperationConst.java storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperation.java storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/issues.txt storage/ndb/src/ndbjtie/ndbapi_jtie.hpp storage/ndb/test/ndbapi/flexAsynch.cpp storage/ndb/test/ndbapi/testNodeRestart.cpp storage/ndb/test/ndbapi/testSystemRestart.cpp storage/perfschema/ha_perfschema.cc storage/perfschema/pfs.cc storage/perfschema/pfs_engine_table.cc storage/perfschema/pfs_engine_table.h storage/perfschema/pfs_instr.cc storage/perfschema/pfs_instr.h storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_server.cc storage/perfschema/pfs_stat.h storage/perfschema/table_esgs_by_account_by_event_name.cc storage/perfschema/table_esgs_by_account_by_event_name.h storage/perfschema/table_esgs_by_host_by_event_name.cc storage/perfschema/table_esgs_by_host_by_event_name.h storage/perfschema/table_esgs_by_thread_by_event_name.cc storage/perfschema/table_esgs_by_thread_by_event_name.h storage/perfschema/table_esgs_by_user_by_event_name.cc storage/perfschema/table_esgs_by_user_by_event_name.h storage/perfschema/table_esgs_global_by_event_name.cc storage/perfschema/table_esgs_global_by_event_name.h storage/perfschema/table_esms_by_account_by_event_name.cc storage/perfschema/table_esms_by_account_by_event_name.h storage/perfschema/table_esms_by_host_by_event_name.cc storage/perfschema/table_esms_by_host_by_event_name.h storage/perfschema/table_esms_by_thread_by_event_name.cc storage/perfschema/table_esms_by_thread_by_event_name.h storage/perfschema/table_esms_by_user_by_event_name.cc storage/perfschema/table_esms_by_user_by_event_name.h storage/perfschema/table_esms_global_by_event_name.cc storage/perfschema/table_esms_global_by_event_name.h storage/perfschema/table_events_stages.cc storage/perfschema/table_events_stages.h storage/perfschema/table_events_statements.cc storage/perfschema/table_events_statements.h storage/perfschema/table_events_waits.cc storage/perfschema/table_events_waits_summary.cc storage/perfschema/table_ews_by_account_by_event_name.cc storage/perfschema/table_ews_by_host_by_event_name.cc storage/perfschema/table_ews_by_thread_by_event_name.cc storage/perfschema/table_ews_by_user_by_event_name.cc storage/perfschema/table_ews_global_by_event_name.cc storage/perfschema/table_tiws_by_index_usage.cc storage/perfschema/table_tiws_by_index_usage.h storage/perfschema/table_tiws_by_table.cc storage/perfschema/table_tiws_by_table.h storage/perfschema/table_tlws_by_table.cc storage/perfschema/table_tlws_by_table.h storage/perfschema/unittest/pfs-t.cc strings/ctype-ucs2.c strings/ctype-utf8.c strings/dtoa.c unittest/gunit/CMakeLists.txt unittest/gunit/bounded_queue-t.cc unittest/gunit/bounds_checked_array-t.cc unittest/gunit/cost_estimate-t.cc unittest/gunit/dbug-t.cc unittest/gunit/dynarray-t.cc unittest/gunit/field-t.cc unittest/gunit/filesort_buffer-t.cc unittest/gunit/get_diagnostics-t.cc unittest/gunit/gunit_test_main.cc unittest/gunit/item-t.cc unittest/gunit/mdl-t.cc unittest/gunit/mdl_mytap-t.cc unittest/gunit/my_regex-t.cc unittest/gunit/opt_range-t.cc unittest/gunit/opt_trace-t.cc unittest/gunit/sql_list-t.cc unittest/gunit/sql_plist-t.cc unittest/gunit/stdcxx-t.cc unittest/gunit/tap_event_listener.cc unittest/gunit/test_utils.cc unittest/gunit/thread_utils-t.cc unittest/gunit/thread_utils.cc mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_basic.result mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_basic.test mysql-test/suite/sys_vars/r/innodb_sort_buffer_size_basic.result mysql-test/suite/sys_vars/t/innodb_sort_buffer_size_basic.test === modified file 'mysql-test/suite/ndb/r/ndb_join_pushdown_default.result' --- a/mysql-test/suite/ndb/r/ndb_join_pushdown_default.result 2012-01-04 20:25:40 +0000 +++ b/mysql-test/suite/ndb/r/ndb_join_pushdown_default.result 2012-01-27 09:04:49 +0000 @@ -294,7 +294,7 @@ left join t1 as t2 on t2.a = t1.c and t2 where t1.a = 2 and t1.b = 3 order by t1.c; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 const PRIMARY PRIMARY 8 const,const 1 100.00 Parent of 2 pushed join@1; Using where; Using filesort +1 SIMPLE t1 const PRIMARY PRIMARY 8 const,const 1 100.00 Parent of 2 pushed join@1; Using where 1 SIMPLE t2 eq_ref PRIMARY PRIMARY 8 test.t1.c,test.t1.d 1 100.00 Child of 't1' in pushed join@1 Warnings: Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c`,`test`.`t2`.`d` AS `d` from `test`.`t1` left join `test`.`t1` `t2` on(((`test`.`t2`.`b` = `test`.`t1`.`d`) and (`test`.`t2`.`a` = `test`.`t1`.`c`))) where ((`test`.`t1`.`b` = 3) and (`test`.`t1`.`a` = 2)) order by `test`.`t1`.`c` @@ -1989,7 +1989,7 @@ join t1 as t2 on t1.a = t2.c and t1.b = where t2.a = 4 and t2.b=4 group by t2.c; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t2 const PRIMARY PRIMARY 8 const,const 1 100.00 Using where; Using filesort +1 SIMPLE t2 const PRIMARY PRIMARY 8 const,const 1 100.00 Using where 1 SIMPLE t1 eq_ref PRIMARY PRIMARY 8 test.t2.c,test.t2.d 1 100.00 Warnings: Note 9999 Table 't2' is not pushable: GROUP BY cannot be done using index on grouped columns. @@ -2030,7 +2030,7 @@ join t1 as t2 on t1.a = t2.c and t1.b = where t2.a = 4 and t2.b=4 group by t2.c order by t2.c; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t2 const PRIMARY PRIMARY 8 const,const 1 100.00 Using where; Using filesort +1 SIMPLE t2 const PRIMARY PRIMARY 8 const,const 1 100.00 Using where 1 SIMPLE t1 eq_ref PRIMARY PRIMARY 8 test.t2.c,test.t2.d 1 100.00 Warnings: Note 9999 Table 't2' is not pushable: GROUP BY cannot be done using index on grouped columns. === modified file 'mysql-test/suite/ndb/r/ndb_join_pushdown_nobnl.result' --- a/mysql-test/suite/ndb/r/ndb_join_pushdown_nobnl.result 2012-01-04 20:25:40 +0000 +++ b/mysql-test/suite/ndb/r/ndb_join_pushdown_nobnl.result 2012-01-27 09:04:49 +0000 @@ -292,7 +292,7 @@ left join t1 as t2 on t2.a = t1.c and t2 where t1.a = 2 and t1.b = 3 order by t1.c; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 const PRIMARY PRIMARY 8 const,const 1 100.00 Parent of 2 pushed join@1; Using where; Using filesort +1 SIMPLE t1 const PRIMARY PRIMARY 8 const,const 1 100.00 Parent of 2 pushed join@1; Using where 1 SIMPLE t2 eq_ref PRIMARY PRIMARY 8 test.t1.c,test.t1.d 1 100.00 Child of 't1' in pushed join@1 Warnings: Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c`,`test`.`t2`.`d` AS `d` from `test`.`t1` left join `test`.`t1` `t2` on(((`test`.`t2`.`b` = `test`.`t1`.`d`) and (`test`.`t2`.`a` = `test`.`t1`.`c`))) where ((`test`.`t1`.`b` = 3) and (`test`.`t1`.`a` = 2)) order by `test`.`t1`.`c` @@ -1986,7 +1986,7 @@ join t1 as t2 on t1.a = t2.c and t1.b = where t2.a = 4 and t2.b=4 group by t2.c; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t2 const PRIMARY PRIMARY 8 const,const 1 100.00 Using where; Using filesort +1 SIMPLE t2 const PRIMARY PRIMARY 8 const,const 1 100.00 Using where 1 SIMPLE t1 eq_ref PRIMARY PRIMARY 8 test.t2.c,test.t2.d 1 100.00 Warnings: Note 9999 Table 't2' is not pushable: GROUP BY cannot be done using index on grouped columns. @@ -2027,7 +2027,7 @@ join t1 as t2 on t1.a = t2.c and t1.b = where t2.a = 4 and t2.b=4 group by t2.c order by t2.c; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t2 const PRIMARY PRIMARY 8 const,const 1 100.00 Using where; Using filesort +1 SIMPLE t2 const PRIMARY PRIMARY 8 const,const 1 100.00 Using where 1 SIMPLE t1 eq_ref PRIMARY PRIMARY 8 test.t2.c,test.t2.d 1 100.00 Warnings: Note 9999 Table 't2' is not pushable: GROUP BY cannot be done using index on grouped columns. === modified file 'mysql-test/suite/ndb/r/ndb_join_pushdown_none.result' --- a/mysql-test/suite/ndb/r/ndb_join_pushdown_none.result 2012-01-04 20:25:40 +0000 +++ b/mysql-test/suite/ndb/r/ndb_join_pushdown_none.result 2012-01-27 09:04:49 +0000 @@ -294,7 +294,7 @@ left join t1 as t2 on t2.a = t1.c and t2 where t1.a = 2 and t1.b = 3 order by t1.c; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 const PRIMARY PRIMARY 8 const,const 1 100.00 Parent of 2 pushed join@1; Using where; Using filesort +1 SIMPLE t1 const PRIMARY PRIMARY 8 const,const 1 100.00 Parent of 2 pushed join@1; Using where 1 SIMPLE t2 eq_ref PRIMARY PRIMARY 8 test.t1.c,test.t1.d 1 100.00 Child of 't1' in pushed join@1 Warnings: Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c`,`test`.`t2`.`d` AS `d` from `test`.`t1` left join `test`.`t1` `t2` on(((`test`.`t2`.`b` = `test`.`t1`.`d`) and (`test`.`t2`.`a` = `test`.`t1`.`c`))) where ((`test`.`t1`.`b` = 3) and (`test`.`t1`.`a` = 2)) order by `test`.`t1`.`c` @@ -1989,7 +1989,7 @@ join t1 as t2 on t1.a = t2.c and t1.b = where t2.a = 4 and t2.b=4 group by t2.c; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t2 const PRIMARY PRIMARY 8 const,const 1 100.00 Using where; Using filesort +1 SIMPLE t2 const PRIMARY PRIMARY 8 const,const 1 100.00 Using where 1 SIMPLE t1 eq_ref PRIMARY PRIMARY 8 test.t2.c,test.t2.d 1 100.00 Warnings: Note 9999 Table 't2' is not pushable: GROUP BY cannot be done using index on grouped columns. @@ -2030,7 +2030,7 @@ join t1 as t2 on t1.a = t2.c and t1.b = where t2.a = 4 and t2.b=4 group by t2.c order by t2.c; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t2 const PRIMARY PRIMARY 8 const,const 1 100.00 Using where; Using filesort +1 SIMPLE t2 const PRIMARY PRIMARY 8 const,const 1 100.00 Using where 1 SIMPLE t1 eq_ref PRIMARY PRIMARY 8 test.t2.c,test.t2.d 1 100.00 Warnings: Note 9999 Table 't2' is not pushable: GROUP BY cannot be done using index on grouped columns. No bundle (reason: useless for push emails).