From: Marc Alff Date: February 14 2011 2:25pm Subject: bzr push into mysql-trunk branch (marc.alff:3205 to 3206) WL#2515 WL#4813 List-Archive: http://lists.mysql.com/commits/131189 Message-Id: <201102141425.p1E6HfWl027480@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3206 Marc Alff 2011-02-14 WL#4813 PERFORMANCE_SCHEMA Instrumenting Stages WL#2515 PERFORMANCE_SCHEMA statements Implementation (partial) added: include/mysql/psi/mysql_stage.h include/mysql/psi/mysql_statement.h storage/perfschema/pfs_con_slice.cc storage/perfschema/pfs_con_slice.h storage/perfschema/pfs_events.h storage/perfschema/pfs_events_stages.cc storage/perfschema/pfs_events_stages.h storage/perfschema/pfs_events_statements.cc storage/perfschema/pfs_events_statements.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_global_by_event_name.cc storage/perfschema/table_esgs_global_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_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 modified: include/mysql/psi/psi.h include/mysql/psi/psi_abi_v1.h.pp include/mysql/psi/psi_abi_v2.h.pp mysql-test/suite/perfschema/include/schema.inc mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/r/column_privilege.result mysql-test/suite/perfschema/r/csv_table_io.result mysql-test/suite/perfschema/r/dml_setup_consumers.result mysql-test/suite/perfschema/r/dml_setup_timers.result mysql-test/suite/perfschema/r/func_file_io.result mysql-test/suite/perfschema/r/indexed_table_io.result mysql-test/suite/perfschema/r/information_schema.result mysql-test/suite/perfschema/r/innodb_table_io.result mysql-test/suite/perfschema/r/memory_table_io.result mysql-test/suite/perfschema/r/merge_table_io.result mysql-test/suite/perfschema/r/multi_table_io.result mysql-test/suite/perfschema/r/myisam_file_io.result mysql-test/suite/perfschema/r/myisam_table_io.result mysql-test/suite/perfschema/r/ortho_iter.result mysql-test/suite/perfschema/r/part_table_io.result mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result mysql-test/suite/perfschema/r/privilege.result mysql-test/suite/perfschema/r/privilege_table_io.result mysql-test/suite/perfschema/r/rollback_table_io.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/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/r/temp_table_io.result mysql-test/suite/perfschema/r/trigger_table_io.result mysql-test/suite/perfschema/r/view_table_io.result mysql-test/suite/perfschema/t/column_privilege.test mysql-test/suite/perfschema/t/privilege.test mysql-test/suite/perfschema/t/start_server_nothing-master.opt scripts/mysql_system_tables.sql sql/sys_vars.cc storage/perfschema/CMakeLists.txt storage/perfschema/ha_perfschema.cc storage/perfschema/pfs.cc storage/perfschema/pfs_column_types.h storage/perfschema/pfs_column_values.cc storage/perfschema/pfs_column_values.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_server.cc storage/perfschema/pfs_server.h storage/perfschema/pfs_stat.h storage/perfschema/pfs_timer.cc storage/perfschema/pfs_timer.h storage/perfschema/pfs_visitor.cc storage/perfschema/pfs_visitor.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_global_by_event_name.cc storage/perfschema/table_helper.cc storage/perfschema/table_helper.h storage/perfschema/table_setup_consumers.cc storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_instruments.h storage/perfschema/table_setup_timers.cc storage/perfschema/unittest/pfs-t.cc storage/perfschema/unittest/pfs_instr-oom-t.cc storage/perfschema/unittest/pfs_instr-t.cc storage/perfschema/unittest/pfs_timer-t.cc 3205 Marc Alff 2011-02-09 [merge] Merge mysql-trunk --> mysql-trunk-wl4813 removed: mysql-test/collections/mysql-5.1-innodb.push mysql-test/collections/mysql-5.5-innodb.push mysql-test/collections/mysql-next-mr-wl2540.push mysql-test/collections/mysql-trunk-innodb.push mysql-test/collections/mysql-trunk.daily mysql-test/collections/mysql-trunk.push mysql-test/collections/mysql-trunk.weekly mysql-test/suite/perfschema/r/debug_env.result mysql-test/suite/perfschema/t/debug_env.test added: include/mysql/service_my_plugin_log.h libservices/my_plugin_log_service.c mysql-test/r/ssl_and_innodb.result mysql-test/suite/innodb/r/innodb-autoinc-56228.result mysql-test/suite/innodb/t/innodb-autoinc-56228-master.opt mysql-test/suite/innodb/t/innodb-autoinc-56228.test mysql-test/suite/sys_vars/r/secure_file_priv2.result mysql-test/suite/sys_vars/t/secure_file_priv2-master.opt mysql-test/suite/sys_vars/t/secure_file_priv2.test mysql-test/t/ssl_and_innodb.test modified: README client/my_readline.h client/mysql.cc client/readline.cc config.h.cmake configure.cmake include/my_pthread.h include/my_sys.h include/my_time.h include/mysql/plugin.h include/mysql/plugin_audit.h.pp include/mysql/plugin_auth.h.pp include/mysql/plugin_ftparser.h.pp include/mysql/services.h include/service_versions.h libmysqld/CMakeLists.txt libservices/CMakeLists.txt mysql-test/collections/default.daily mysql-test/collections/default.experimental mysql-test/collections/default.push mysql-test/collections/default.weekly mysql-test/include/gis_keys.inc mysql-test/include/icp_tests.inc mysql-test/include/mtr_warnings.sql mysql-test/include/mysqlhotcopy.inc mysql-test/include/order_by.inc mysql-test/include/rpl_sync.inc mysql-test/include/subquery.inc mysql-test/include/subquery_sj.inc mysql-test/include/subquery_sj_innodb.inc mysql-test/mysql-test-run.pl mysql-test/r/delete.result mysql-test/r/filesort_debug.result mysql-test/r/func_in_all.result mysql-test/r/func_time.result mysql-test/r/gis.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/join_outer.result mysql-test/r/myisam_icp.result mysql-test/r/myisam_icp_all.result mysql-test/r/myisam_icp_none.result mysql-test/r/not_embedded_server.result mysql-test/r/optimizer_switch.result mysql-test/r/order_by_all.result mysql-test/r/order_by_icp_mrr.result mysql-test/r/order_by_none.result mysql-test/r/plugin_auth.result mysql-test/r/plugin_auth_qa_1.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_all.result mysql-test/r/subquery_sj_all_jcl6.result mysql-test/r/subquery_sj_all_jcl7.result mysql-test/r/subquery_sj_dupsweed.result mysql-test/r/subquery_sj_dupsweed_jcl6.result mysql-test/r/subquery_sj_dupsweed_jcl7.result mysql-test/r/subquery_sj_firstmatch.result mysql-test/r/subquery_sj_firstmatch_jcl6.result mysql-test/r/subquery_sj_firstmatch_jcl7.result mysql-test/r/subquery_sj_innodb_all.result mysql-test/r/subquery_sj_innodb_all_jcl6.result mysql-test/r/subquery_sj_innodb_all_jcl7.result mysql-test/r/subquery_sj_innodb_none.result mysql-test/r/subquery_sj_innodb_none_jcl6.result mysql-test/r/subquery_sj_innodb_none_jcl7.result mysql-test/r/subquery_sj_loosescan.result mysql-test/r/subquery_sj_loosescan_jcl6.result mysql-test/r/subquery_sj_loosescan_jcl7.result mysql-test/r/subquery_sj_mat.result mysql-test/r/subquery_sj_mat_jcl6.result mysql-test/r/subquery_sj_mat_jcl7.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_year.result mysql-test/r/user_var.result mysql-test/suite/binlog/r/binlog_unsafe.result mysql-test/suite/binlog/t/binlog_unsafe.test mysql-test/suite/engines/funcs/r/ps_string_not_null.result mysql-test/suite/engines/funcs/t/ps_string_not_null.test mysql-test/suite/innodb/r/innodb_gis.result mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result mysql-test/suite/rpl/r/rpl_loaddatalocal.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test mysql-test/suite/rpl/t/rpl_loaddatalocal.test mysql-test/t/delete.test mysql-test/t/filesort_debug.test mysql-test/t/func_time.test mysql-test/t/grant.test mysql-test/t/join_outer.test mysql-test/t/mysql.test mysql-test/t/not_embedded_server.test mysql-test/t/optimizer_switch.test mysql-test/t/plugin_auth.test mysql-test/t/plugin_auth_qa_1.test mysql-test/t/type_year.test mysql-test/t/user_var.test mysql-test/t/variables.test mysql-test/valgrind.supp mysys/my_fopen.c mysys/my_getsystime.c plugin/auth/test_plugin.c regex/my_regex.h regex/regcomp.c regex/reginit.c sql-common/my_time.c sql/CMakeLists.txt sql/field.cc sql/filesort.cc sql/gcalc_slicescan.cc sql/gcalc_slicescan.h sql/handler.cc sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_func.cc sql/item_geofunc.h sql/item_strfunc.h sql/item_subselect.h sql/log.cc sql/mysqld.cc sql/net_serv.cc sql/protocol.cc sql/rpl_info_handler.h sql/rpl_injector.cc sql/rpl_injector.h sql/rpl_slave.cc sql/share/errmsg-utf8.txt sql/sql_base.cc sql/sql_class.cc sql/sql_class.h sql/sql_delete.cc sql/sql_lex.cc sql/sql_load.cc sql/sql_parse.cc sql/sql_plugin_services.h sql/sql_select.cc sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc sql/unireg.h storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0sea.c storage/innobase/buf/buf0buddy.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0lru.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/dict/dict0stats.c storage/innobase/fsp/fsp0fsp.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/handler0alter.cc storage/innobase/handler/i_s.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0cur.h storage/innobase/include/buf0buf.h storage/innobase/include/buf0lru.h storage/innobase/include/dict0types.h storage/innobase/include/os0sync.h storage/innobase/include/os0sync.ic storage/innobase/include/rem0cmp.h storage/innobase/include/rem0cmp.ic storage/innobase/include/row0upd.h storage/innobase/include/srv0srv.h storage/innobase/include/trx0trx.h storage/innobase/include/trx0trx.ic storage/innobase/include/univ.i storage/innobase/include/ut0vec.h storage/innobase/include/ut0vec.ic storage/innobase/lock/lock0lock.c storage/innobase/lock/lock0wait.c storage/innobase/mem/mem0mem.c storage/innobase/page/page0zip.c storage/innobase/que/que0que.c storage/innobase/rem/rem0cmp.c storage/innobase/row/row0ins.c storage/innobase/row/row0merge.c storage/innobase/row/row0mysql.c storage/innobase/row/row0purge.c storage/innobase/row/row0sel.c storage/innobase/row/row0umod.c storage/innobase/row/row0upd.c storage/innobase/srv/srv0start.c storage/innobase/sync/sync0sync.c storage/innobase/trx/trx0purge.c storage/innobase/trx/trx0roll.c storage/innobase/trx/trx0trx.c storage/perfschema/pfs.cc storage/perfschema/pfs_engine_table.cc storage/perfschema/pfs_engine_table.h storage/perfschema/pfs_instr.h storage/perfschema/pfs_instr_class.cc storage/perfschema/pfs_setup_actor.h storage/perfschema/pfs_setup_object.h storage/perfschema/pfs_stat.h storage/perfschema/pfs_timer.h storage/perfschema/table_helper.h unittest/gunit/CMakeLists.txt unittest/gunit/item-t.cc Diff too large for email (13587 lines, the limit is 10000). No bundle (reason: useless for push emails).