From: Bjorn Munch Date: January 25 2011 12:35pm Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:3016) List-Archive: http://lists.mysql.com/commits/129556 Message-Id: <201101251235.p0PCZrcr000991@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/bm136801/my/mtr-tr/ based on revid:magnus.blaudd@stripped 3016 Bjorn Munch 2011-01-25 [merge] merge from trunk added: mysql-test/suite/perfschema/include/event_aggregate_cleanup.inc mysql-test/suite/perfschema/include/event_aggregate_load.inc mysql-test/suite/perfschema/include/event_aggregate_setup.inc mysql-test/suite/perfschema/include/table_aggregate_cleanup.inc mysql-test/suite/perfschema/include/table_aggregate_load.inc mysql-test/suite/perfschema/include/table_aggregate_setup.inc mysql-test/suite/perfschema/r/ddl_tiws_by_index_usage.result mysql-test/suite/perfschema/r/ddl_tiws_by_table.result mysql-test/suite/perfschema/r/ddl_tlws_by_table.result mysql-test/suite/perfschema/r/dml_tiws_by_index_usage.result mysql-test/suite/perfschema/r/dml_tiws_by_table.result mysql-test/suite/perfschema/r/dml_tlws_by_table.result mysql-test/suite/perfschema/r/event_aggregate.result mysql-test/suite/perfschema/r/ortho_iter.result mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_aggregate_off.result mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/t/ddl_tiws_by_index_usage.test mysql-test/suite/perfschema/t/ddl_tiws_by_table.test mysql-test/suite/perfschema/t/ddl_tlws_by_table.test mysql-test/suite/perfschema/t/dml_tiws_by_index_usage.test mysql-test/suite/perfschema/t/dml_tiws_by_table.test mysql-test/suite/perfschema/t/dml_tlws_by_table.test mysql-test/suite/perfschema/t/event_aggregate-master.opt mysql-test/suite/perfschema/t/event_aggregate.test mysql-test/suite/perfschema/t/ortho_iter.test mysql-test/suite/perfschema/t/table_aggregate_global_2u_2t.test mysql-test/suite/perfschema/t/table_aggregate_global_2u_3t.test mysql-test/suite/perfschema/t/table_aggregate_global_4u_2t.test mysql-test/suite/perfschema/t/table_aggregate_global_4u_3t.test mysql-test/suite/perfschema/t/table_aggregate_hist_2u_2t.test mysql-test/suite/perfschema/t/table_aggregate_hist_2u_3t.test mysql-test/suite/perfschema/t/table_aggregate_hist_4u_2t.test mysql-test/suite/perfschema/t/table_aggregate_hist_4u_3t.test mysql-test/suite/perfschema/t/table_aggregate_off.test mysql-test/suite/perfschema/t/table_aggregate_thread_2u_2t.test mysql-test/suite/perfschema/t/table_aggregate_thread_2u_3t.test mysql-test/suite/perfschema/t/table_aggregate_thread_4u_2t.test mysql-test/suite/perfschema/t/table_aggregate_thread_4u_3t.test mysql-test/suite/perfschema/t/table_io_aggregate_global_2u_2t.test mysql-test/suite/perfschema/t/table_io_aggregate_global_2u_3t.test mysql-test/suite/perfschema/t/table_io_aggregate_global_4u_2t.test mysql-test/suite/perfschema/t/table_io_aggregate_global_4u_3t.test mysql-test/suite/perfschema/t/table_io_aggregate_hist_2u_2t.test mysql-test/suite/perfschema/t/table_io_aggregate_hist_2u_3t.test mysql-test/suite/perfschema/t/table_io_aggregate_hist_4u_2t.test mysql-test/suite/perfschema/t/table_io_aggregate_hist_4u_3t.test mysql-test/suite/perfschema/t/table_io_aggregate_thread_2u_2t.test mysql-test/suite/perfschema/t/table_io_aggregate_thread_2u_3t.test mysql-test/suite/perfschema/t/table_io_aggregate_thread_4u_2t.test mysql-test/suite/perfschema/t/table_io_aggregate_thread_4u_3t.test mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t.test mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t.test mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t.test mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t.test mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t.test mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t.test mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t.test mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t.test mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t.test mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t.test mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t.test mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t.test mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt storage/perfschema/pfs_visitor.cc storage/perfschema/pfs_visitor.h 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 modified: include/mysql/psi/mysql_table.h include/mysql/psi/psi.h include/mysql/psi/psi_abi_v1.h.pp include/mysql/psi/psi_abi_v2.h.pp mysql-test/collections/mysql-trunk.daily mysql-test/include/icp_tests.inc mysql-test/include/mrr_tests.inc mysql-test/include/subquery.inc mysql-test/r/func_group.result mysql-test/r/grant.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_outer_jcl6.result mysql-test/r/limit.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_all.result mysql-test/r/myisam_icp_none.result mysql-test/r/myisam_mrr.result mysql-test/r/myisam_mrr_all.result mysql-test/r/myisam_mrr_cost.result mysql-test/r/myisam_mrr_cost_all.result mysql-test/r/myisam_mrr_cost_icp.result mysql-test/r/myisam_mrr_icp.result mysql-test/r/myisam_mrr_none.result mysql-test/r/select_all_jcl6.result mysql-test/r/select_icp_mrr_jcl6.result mysql-test/r/select_none_jcl6.result mysql-test/r/subquery_all.result mysql-test/r/subquery_all_jcl6.result mysql-test/r/subquery_nomat_nosj.result mysql-test/r/subquery_nomat_nosj_jcl6.result mysql-test/r/subquery_none.result mysql-test/r/subquery_none_jcl6.result mysql-test/r/subquery_sj_mat_nosj.result mysql-test/r/subquery_sj_none_jcl6.result mysql-test/r/subquery_sj_none_jcl7.result mysql-test/r/type_datetime.result mysql-test/suite/parts/t/partition_exch_qa_14.test mysql-test/suite/perfschema/include/schema.inc mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/r/func_file_io.result mysql-test/suite/perfschema/r/information_schema.result mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result mysql-test/suite/perfschema/r/schema_lc0.result mysql-test/suite/perfschema/r/schema_lc1.result mysql-test/suite/perfschema/r/schema_lc2.result mysql-test/suite/perfschema/r/start_server_no_cond_class.result mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-test/suite/perfschema/r/start_server_no_file_class.result mysql-test/suite/perfschema/r/start_server_no_file_inst.result mysql-test/suite/perfschema/r/start_server_no_mutex_class.result mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result mysql-test/suite/perfschema/r/start_server_no_setup_actors.result mysql-test/suite/perfschema/r/start_server_no_setup_objects.result mysql-test/suite/perfschema/r/start_server_no_table_hdl.result mysql-test/suite/perfschema/r/start_server_no_table_inst.result mysql-test/suite/perfschema/r/start_server_no_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_nothing.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.result mysql-test/suite/rpl/r/rpl_row_ignorable_event.result mysql-test/suite/rpl/t/rpl_row_ignorable_event.test mysql-test/t/type_datetime.test mysys/thr_lock.c scripts/mysql_system_tables.sql sql/field.cc sql/field.h sql/handler.cc sql/item.cc sql/item_cmpfunc.cc sql/item_subselect.cc sql/rpl_master.cc sql/rpl_slave.cc sql/sql_acl.cc sql/sql_insert.cc sql/sql_select.cc sql/sql_show.cc sql/table.cc storage/perfschema/CMakeLists.txt storage/perfschema/pfs.cc storage/perfschema/pfs_column_types.h storage/perfschema/pfs_engine_table.cc storage/perfschema/pfs_events_waits.cc storage/perfschema/pfs_events_waits.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_lock.h storage/perfschema/pfs_stat.h storage/perfschema/table_events_waits.cc storage/perfschema/table_events_waits.h storage/perfschema/table_ews_by_thread_by_event_name.cc storage/perfschema/table_ews_by_thread_by_event_name.h storage/perfschema/table_ews_global_by_event_name.cc storage/perfschema/table_ews_global_by_event_name.h storage/perfschema/table_helper.cc storage/perfschema/table_helper.h storage/perfschema/table_os_global_by_type.cc storage/perfschema/table_setup_instruments.cc strings/bchange.c strings/bmove_upp.c strings/conf_to_src.c strings/ctype-big5.c strings/ctype-bin.c strings/ctype-cp932.c strings/ctype-czech.c strings/ctype-euc_kr.c strings/ctype-eucjpms.c strings/ctype-extra.c strings/ctype-gb2312.c strings/ctype-gbk.c strings/ctype-latin1.c strings/ctype-mb.c strings/ctype-simple.c strings/ctype-sjis.c strings/ctype-tis620.c strings/ctype-uca.c strings/ctype-ucs2.c strings/ctype-ujis.c strings/ctype-utf8.c strings/ctype-win1250ch.c strings/ctype.c strings/do_ctype.c strings/dtoa.c strings/dump_map.c strings/int2str.c strings/is_prefix.c strings/llstr.c strings/longlong2str.c strings/my_strchr.c strings/my_strtoll10.c strings/my_vsnprintf.c strings/str2int.c strings/str_alloc.c strings/strappend.c strings/strcend.c strings/strcont.c strings/strend.c strings/strfill.c strings/strmake.c strings/strmov.c strings/strnlen.c strings/strnmov.c strings/strxmov.c strings/strxnmov.c strings/uca-dump.c strings/uctypedump.c strings/utr11-dump.c strings/xml.c Diff too large for email (53206 lines, the limit is 10000). No bundle (reason: revision is a merge).