From: Tor Didriksen Date: January 30 2012 1:15pm Subject: bzr push into mysql-trunk branch (tor.didriksen:3467 to 3469) List-Archive: http://lists.mysql.com/commits/142637 Message-Id: <201201301315.q0UDFuZO009652@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3469 Tor Didriksen 2012-01-30 [merge] empty merge trunk => opt-team 3468 Tor Didriksen 2012-01-30 [merge] merge trunk => opt-team added: mysql-test/suite/sys_vars/r/stored_program_cache_basic.result mysql-test/suite/sys_vars/t/stored_program_cache_basic.test renamed: 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: cmake/build_configurations/mysql_release.cmake include/m_ctype.h libmysql/CMakeLists.txt mysql-test/extra/rpl_tests/rpl_start_stop_slave.test mysql-test/include/func_in.inc 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/wait_for_ndb_to_binlog.inc mysql-test/mysql-test-run.pl mysql-test/r/bigint.result mysql-test/r/ctype_utf8.result mysql-test/r/date_formats.result mysql-test/r/func_in_all.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_str.result mysql-test/r/func_time.result mysql-test/r/innodb_icp.result mysql-test/r/innodb_icp_none.result mysql-test/r/innodb_mrr.result mysql-test/r/innodb_mrr_cost.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/lowercase_fs_off.result mysql-test/r/merge.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.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_binlog_stmt.result mysql-test/r/partition_explicit_prune.result mysql-test/r/plugin.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/sp-security.result mysql-test/r/sp.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/view.result mysql-test/r/xa.result mysql-test/suite/opt_trace/include/range.inc mysql-test/suite/parts/inc/partition-dml-1-7.inc mysql-test/suite/parts/inc/partition-dml-1-8.inc mysql-test/suite/parts/inc/partition_key_16col.inc mysql-test/suite/parts/inc/partition_key_32col.inc mysql-test/suite/parts/inc/partition_key_4col.inc mysql-test/suite/parts/inc/partition_key_8col.inc 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/parts/r/partition_special_myisam.result 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/sys_vars/r/innodb_undo_logs_basic.result mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test mysql-test/t/bigint.test mysql-test/t/ctype_utf8.test mysql-test/t/date_formats.test mysql-test/t/func_str.test mysql-test/t/func_time.test mysql-test/t/merge.test mysql-test/t/mysql_embedded.test mysql-test/t/optimizer_debug_sync.test mysql-test/t/partition_binlog_stmt.test mysql-test/t/partition_explicit_prune.test mysql-test/t/plugin.test mysql-test/t/sp-security.test mysql-test/t/sp.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/view.test mysql-test/t/xa.test mysql-test/valgrind.supp mysys/charset-def.c sql/debug_sync.cc sql/handler.cc sql/handler.h sql/item.cc sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_func.cc sql/item_func.h sql/item_timefunc.cc sql/mysqld.cc sql/mysqld.h sql/opt_explain.cc sql/opt_range.cc sql/records.cc sql/rpl_master.cc sql/share/errmsg-utf8.txt sql/sp_cache.cc sql/sp_cache.h sql/sql_executor.cc sql/sql_lex.cc sql/sql_parse.cc sql/sql_prepare.cc sql/sql_select.cc sql/sql_tmp_table.cc sql/sql_view.cc sql/sys_vars.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/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/trx0trx.cc storage/innobase/ut/ut0crc32.cc storage/myisammrg/ha_myisammrg.cc storage/perfschema/ha_perfschema.cc storage/perfschema/pfs_engine_table.cc storage/perfschema/pfs_engine_table.h storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_instr_class.h storage/perfschema/pfs_server.cc 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 strings/ctype-ucs2.c strings/ctype-utf8.c strings/dtoa.c mysql-test/suite/sys_vars/r/innodb_sort_buffer_size_basic.result mysql-test/suite/sys_vars/t/innodb_sort_buffer_size_basic.test 3467 Tor Didriksen 2012-01-30 [merge] merge opt-backporting => opt-team modified: mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result mysql-test/suite/opt_trace/r/general2_ps_prot.result mysql-test/suite/opt_trace/r/general_ps_prot_all.result mysql-test/suite/opt_trace/r/general_ps_prot_none.result mysql-test/suite/opt_trace/r/range_ps_prot.result mysql-test/suite/opt_trace/r/subquery_ps_prot.result Diff too large for email (10441 lines, the limit is 10000). No bundle (reason: useless for push emails).