From: Marc Alff Date: January 21 2011 10:54am Subject: bzr push into mysql-trunk-wl5379 branch (marc.alff:3215 to 3216) List-Archive: http://lists.mysql.com/commits/129317 Message-Id: <201101211055.p0L9Z8V4002760@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3216 Marc Alff 2011-01-21 [merge] Merge mysql-trunk --> mysql-trunk-wl5379 added: mysql-test/extra/rpl_tests/rpl_show_binlog_events.inc mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc mysql-test/include/plugin.defs mysql-test/include/restart_slave_sql.inc mysql-test/include/rpl_connection_master.inc mysql-test/include/rpl_connection_slave.inc mysql-test/include/rpl_connection_slave1.inc mysql-test/r/filesort_debug.result mysql-test/suite/sys_vars/r/autocommit_func4.result mysql-test/suite/sys_vars/r/autocommit_func5.result mysql-test/suite/sys_vars/t/autocommit_func4-master.opt mysql-test/suite/sys_vars/t/autocommit_func4.test mysql-test/suite/sys_vars/t/autocommit_func5-master.opt mysql-test/suite/sys_vars/t/autocommit_func5.test mysql-test/t/filesort_debug.test unittest/gunit/my_decimal-t.cc modified: client/client_priv.h 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 client/mysqltest.cc cmake/character_sets.cmake config.h.cmake extra/my_print_defaults.c include/my_sys.h mysql-test/collections/README.experimental mysql-test/collections/default.experimental mysql-test/extra/rpl_tests/rpl_change_master.test mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc mysql-test/include/func_in.inc mysql-test/include/icp_tests.inc mysql-test/include/mrr_tests.inc mysql-test/include/rpl_start_server.inc mysql-test/include/rpl_stop_server.inc mysql-test/include/select.inc mysql-test/include/setup_fake_relay_log.inc mysql-test/include/subquery.inc mysql-test/include/wait_for_status_var.inc mysql-test/lib/My/ConfigFactory.pm mysql-test/lib/My/CoreDump.pm mysql-test/lib/My/File/Path.pm mysql-test/lib/My/Find.pm mysql-test/lib/My/Options.pm mysql-test/lib/My/Platform.pm mysql-test/lib/My/SafeProcess.pm mysql-test/lib/My/SafeProcess/Base.pm mysql-test/lib/My/SafeProcess/safe_kill_win.cc mysql-test/lib/My/SafeProcess/safe_process.cc mysql-test/lib/My/SafeProcess/safe_process_win.cc mysql-test/lib/My/SysInfo.pm mysql-test/lib/My/Test.pm mysql-test/lib/mtr_cases.pm mysql-test/lib/mtr_gcov.pl mysql-test/lib/mtr_gprof.pl mysql-test/lib/mtr_io.pl mysql-test/lib/mtr_match.pm mysql-test/lib/mtr_misc.pl mysql-test/lib/mtr_report.pm mysql-test/lib/mtr_stress.pl mysql-test/lib/mtr_unique.pm mysql-test/mysql-stress-test.pl mysql-test/mysql-test-run.pl mysql-test/r/client_xml.result mysql-test/r/ctype_many.result mysql-test/r/ctype_ucs.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_like.result mysql-test/r/func_math.result mysql-test/r/func_str.result mysql-test/r/gis-precise.result mysql-test/r/gis.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/innodb_mysql_sync.result mysql-test/r/join_outer.result mysql-test/r/join_outer_jcl6.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/mysqladmin.result mysql-test/r/mysqlbinlog_row_big.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqldump.result mysql-test/r/mysqltest.result mysql-test/r/not_embedded_server.result mysql-test/r/partition.result mysql-test/r/partition_error.result mysql-test/r/partition_range.result mysql-test/r/plugin_auth.result mysql-test/r/select_all.result mysql-test/r/select_all_jcl6.result mysql-test/r/select_icp_mrr.result mysql-test/r/select_icp_mrr_jcl6.result mysql-test/r/select_none.result mysql-test/r/select_none_jcl6.result mysql-test/r/show_check.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.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/r/type_timestamp.result mysql-test/r/udf.result mysql-test/r/union.result mysql-test/r/update.result mysql-test/r/view_grant.result mysql-test/r/xml.result mysql-test/suite/bugs/t/bug57108.test mysql-test/suite/innodb/r/innodb-timeout.result mysql-test/suite/innodb/r/innodb.result mysql-test/suite/innodb/t/innodb-timeout.test mysql-test/suite/innodb/t/innodb.test mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc mysql-test/suite/parts/r/part_supported_sql_func_innodb.result mysql-test/suite/parts/r/part_supported_sql_func_myisam.result mysql-test/suite/perfschema/r/server_init.result mysql-test/suite/perfschema/t/server_init.test mysql-test/suite/rpl/r/rpl_change_master.result mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result mysql-test/suite/rpl/r/rpl_heartbeat_basic.result mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result mysql-test/suite/rpl/r/rpl_stop_slave.result mysql-test/suite/rpl/t/rpl_cross_version.test mysql-test/suite/rpl/t/rpl_heartbeat_basic.test mysql-test/suite/rpl/t/rpl_packet.test mysql-test/suite/rpl/t/rpl_stop_slave.test mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_func.result mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test mysql-test/t/bug46261.test mysql-test/t/ctype_many.test mysql-test/t/ctype_ucs.test mysql-test/t/fulltext_plugin.test mysql-test/t/func_like.test mysql-test/t/func_math.test mysql-test/t/func_str.test mysql-test/t/gis-precise.test mysql-test/t/gis.test mysql-test/t/innodb_mysql_sync.test mysql-test/t/join_outer.test mysql-test/t/mysqladmin.test mysql-test/t/mysqlbinlog_row_big.test mysql-test/t/mysqldump.test mysql-test/t/mysqltest.test mysql-test/t/not_embedded_server.test mysql-test/t/partition.test mysql-test/t/partition_error.test mysql-test/t/partition_range.test mysql-test/t/plugin.test mysql-test/t/plugin_auth.test mysql-test/t/plugin_auth_qa_2-master.opt mysql-test/t/plugin_auth_qa_3-master.opt mysql-test/t/plugin_not_embedded.test mysql-test/t/show_check.test mysql-test/t/type_datetime.test mysql-test/t/type_timestamp.test mysql-test/t/udf.test mysql-test/t/union.test mysql-test/t/view_grant.test mysql-test/t/xml.test mysql-test/valgrind.supp mysys/default.c mysys/my_fopen.c mysys/my_getopt.c mysys/my_getsystime.c mysys/my_init.c mysys/my_thr_init.c mysys/mysys_priv.h sql-common/client.c sql/bounded_queue.h sql/field.cc sql/field.h sql/filesort.cc sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_func.cc sql/item_func.h sql/item_geofunc.h sql/item_strfunc.cc sql/item_strfunc.h sql/item_subselect.cc sql/item_sum.h sql/item_timefunc.h sql/log.cc sql/log_event.cc sql/log_event.h sql/my_decimal.h sql/mysqld.cc sql/mysqld.h sql/net_serv.cc sql/rpl_master.cc sql/rpl_slave.cc sql/sql_admin.cc sql/sql_analyse.cc sql/sql_base.cc sql/sql_partition.cc sql/sql_select.cc sql/sql_select.h sql/sql_string.cc sql/sql_string.h sql/sql_udf.cc sql/sql_view.cc sql/sql_yacc.yy sql/table.cc storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/buf/buf0buf.c storage/innobase/dict/dict0dict.c storage/innobase/fsp/fsp0fsp.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/i_s.cc storage/innobase/include/btr0cur.h storage/innobase/include/data0data.h storage/innobase/include/data0data.ic storage/innobase/include/row0upd.h storage/innobase/include/srv0srv.h storage/innobase/include/sync0rw.h storage/innobase/include/trx0i_s.h storage/innobase/include/trx0purge.h storage/innobase/include/univ.i storage/innobase/log/log0recv.c storage/innobase/row/row0mysql.c storage/innobase/row/row0purge.c storage/innobase/row/row0umod.c storage/innobase/row/row0upd.c storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innobase/trx/trx0i_s.c storage/innobase/trx/trx0purge.c storage/innobase/ut/ut0dbg.c storage/myisam/ha_myisam.cc storage/ndb/test/run-test/setup.cpp 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/decimal.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 unittest/gunit/CMakeLists.txt 3215 Marc Alff 2011-01-07 WL#5371 PERFORMANCE_SCHEMA Instrumenting Table Locks WL#5379 PERFORMANCE SCHEMA TABLE / INDEX IO SUMMARY WL#5420 PERFORMANCE SCHEMA TABLE LOCK WAIT SUMMARY Code cleanup, implemented a visitor pattern to reduce code duplication. added: storage/perfschema/pfs_visitor.cc storage/perfschema/pfs_visitor.h modified: storage/perfschema/CMakeLists.txt 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_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 Diff too large for email (30589 lines, the limit is 10000). No bundle (reason: useless for push emails).