List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:August 11 2011 3:31am
Subject:bzr push into mysql-trunk branch (chris.powers:3360 to 3362)
View as plain text  
 3362 Christopher Powers	2011-08-10
      local merge

    modified:
      mysql-test/suite/perfschema/t/disabled.def
 3361 Christopher Powers	2011-08-10 [merge]
      WL#4896 "Performance Schem Net IO"
      
      - Fix Solaris build break
      - Merge with mysql-trunk to pick up WL#5378 "Performance Schema Summary By User/Host"

    added:
      mysql-test/suite/perfschema/include/connection_cleanup.inc
      mysql-test/suite/perfschema/include/connection_load.inc
      mysql-test/suite/perfschema/include/connection_setup.inc
      mysql-test/suite/perfschema/include/no_protocol.inc
      mysql-test/suite/perfschema/include/wait_for_pfs_thread_count.inc
      mysql-test/suite/perfschema/r/connection.result
      mysql-test/suite/perfschema/r/connection_3a.result
      mysql-test/suite/perfschema/r/connection_3a_3u.result
      mysql-test/suite/perfschema/r/connection_3u.result
      mysql-test/suite/perfschema/r/ddl_accounts.result
      mysql-test/suite/perfschema/r/ddl_esgs_by_account_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_esgs_by_host_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_esgs_by_user_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_esms_by_account_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_esms_by_host_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_esms_by_user_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_ews_by_account_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_ews_by_host_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_ews_by_user_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_hosts.result
      mysql-test/suite/perfschema/r/ddl_users.result
      mysql-test/suite/perfschema/r/dml_accounts.result
      mysql-test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result
      mysql-test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result
      mysql-test/suite/perfschema/r/dml_esgs_by_user_by_event_name.result
      mysql-test/suite/perfschema/r/dml_esms_by_account_by_event_name.result
      mysql-test/suite/perfschema/r/dml_esms_by_host_by_event_name.result
      mysql-test/suite/perfschema/r/dml_esms_by_user_by_event_name.result
      mysql-test/suite/perfschema/r/dml_ews_by_account_by_event_name.result
      mysql-test/suite/perfschema/r/dml_ews_by_host_by_event_name.result
      mysql-test/suite/perfschema/r/dml_ews_by_user_by_event_name.result
      mysql-test/suite/perfschema/r/dml_hosts.result
      mysql-test/suite/perfschema/r/dml_users.result
      mysql-test/suite/perfschema/r/event_aggregate_no_a.result
      mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
      mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result
      mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
      mysql-test/suite/perfschema/r/event_aggregate_no_h.result
      mysql-test/suite/perfschema/r/event_aggregate_no_u.result
      mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result.THIS
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result.THIS
      mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result.THIS
      mysql-test/suite/perfschema/r/schema_lc0.result.THIS
      mysql-test/suite/perfschema/r/schema_lc1.result.THIS
      mysql-test/suite/perfschema/r/schema_lc2.result.THIS
      mysql-test/suite/perfschema/r/start_server_no_account.result
      mysql-test/suite/perfschema/r/start_server_no_host.result
      mysql-test/suite/perfschema/r/start_server_no_user.result
      mysql-test/suite/perfschema/r/start_server_no_waits_history.result
      mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
      mysql-test/suite/perfschema/t/connection.test
      mysql-test/suite/perfschema/t/connection_3a-master.opt
      mysql-test/suite/perfschema/t/connection_3a.test
      mysql-test/suite/perfschema/t/connection_3a_3u-master.opt
      mysql-test/suite/perfschema/t/connection_3a_3u.test
      mysql-test/suite/perfschema/t/connection_3u-master.opt
      mysql-test/suite/perfschema/t/connection_3u.test
      mysql-test/suite/perfschema/t/ddl_accounts.test
      mysql-test/suite/perfschema/t/ddl_esgs_by_account_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_esgs_by_host_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_esgs_by_user_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_esms_by_account_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_esms_by_host_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_esms_by_user_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_ews_by_account_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_ews_by_host_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_ews_by_user_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_hosts.test
      mysql-test/suite/perfschema/t/ddl_users.test
      mysql-test/suite/perfschema/t/dml_accounts.test
      mysql-test/suite/perfschema/t/dml_esgs_by_account_by_event_name.test
      mysql-test/suite/perfschema/t/dml_esgs_by_host_by_event_name.test
      mysql-test/suite/perfschema/t/dml_esgs_by_user_by_event_name.test
      mysql-test/suite/perfschema/t/dml_esms_by_account_by_event_name.test
      mysql-test/suite/perfschema/t/dml_esms_by_host_by_event_name.test
      mysql-test/suite/perfschema/t/dml_esms_by_user_by_event_name.test
      mysql-test/suite/perfschema/t/dml_ews_by_account_by_event_name.test
      mysql-test/suite/perfschema/t/dml_ews_by_host_by_event_name.test
      mysql-test/suite/perfschema/t/dml_ews_by_user_by_event_name.test
      mysql-test/suite/perfschema/t/dml_hosts.test
      mysql-test/suite/perfschema/t/dml_users.test
      mysql-test/suite/perfschema/t/event_aggregate_no_a-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_a.test
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test
      mysql-test/suite/perfschema/t/event_aggregate_no_h-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_h.test
      mysql-test/suite/perfschema/t/event_aggregate_no_u-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_u.test
      mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h-master.opt
      mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test
      mysql-test/suite/perfschema/t/start_server_no_account-master.opt
      mysql-test/suite/perfschema/t/start_server_no_account.test
      mysql-test/suite/perfschema/t/start_server_no_host-master.opt
      mysql-test/suite/perfschema/t/start_server_no_host.test
      mysql-test/suite/perfschema/t/start_server_no_user-master.opt
      mysql-test/suite/perfschema/t/start_server_no_user.test
      mysql-test/suite/perfschema/t/start_server_no_waits_history-master.opt
      mysql-test/suite/perfschema/t/start_server_no_waits_history.test
      mysql-test/suite/perfschema/t/start_server_no_waits_history_long-master.opt
      mysql-test/suite/perfschema/t/start_server_no_waits_history_long.test
      mysql-test/suite/sys_vars/r/innodb_file_format_max_basic.result
      mysql-test/suite/sys_vars/r/innodb_flush_neighbors_basic.result
      mysql-test/suite/sys_vars/r/innodb_lru_scan_depth_basic.result
      mysql-test/suite/sys_vars/r/innodb_rollback_segments_basic.result
      mysql-test/suite/sys_vars/r/innodb_stats_method_basic.result
      mysql-test/suite/sys_vars/r/pfs_accounts_size_basic.result
      mysql-test/suite/sys_vars/r/pfs_hosts_size_basic.result
      mysql-test/suite/sys_vars/r/pfs_users_size_basic.result
      mysql-test/suite/sys_vars/t/innodb_file_format_max_basic.test
      mysql-test/suite/sys_vars/t/innodb_flush_neighbors_basic.test
      mysql-test/suite/sys_vars/t/innodb_lru_scan_depth_basic.test
      mysql-test/suite/sys_vars/t/innodb_rollback_segments_basic.test
      mysql-test/suite/sys_vars/t/innodb_stats_method_basic.test
      mysql-test/suite/sys_vars/t/pfs_accounts_size_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_accounts_size_basic.test
      mysql-test/suite/sys_vars/t/pfs_hosts_size_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_hosts_size_basic.test
      mysql-test/suite/sys_vars/t/pfs_users_size_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_users_size_basic.test
      storage/perfschema/cursor_by_account.cc
      storage/perfschema/cursor_by_account.h
      storage/perfschema/cursor_by_host.cc
      storage/perfschema/cursor_by_host.h
      storage/perfschema/cursor_by_thread.cc
      storage/perfschema/cursor_by_thread.h
      storage/perfschema/cursor_by_user.cc
      storage/perfschema/cursor_by_user.h
      storage/perfschema/pfs_account.cc
      storage/perfschema/pfs_account.h
      storage/perfschema/pfs_host.cc
      storage/perfschema/pfs_host.h
      storage/perfschema/pfs_user.cc
      storage/perfschema/pfs_user.h
      storage/perfschema/table_accounts.cc
      storage/perfschema/table_accounts.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_user_by_event_name.cc
      storage/perfschema/table_esgs_by_user_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_user_by_event_name.cc
      storage/perfschema/table_esms_by_user_by_event_name.h
      storage/perfschema/table_ews_by_account_by_event_name.cc
      storage/perfschema/table_ews_by_account_by_event_name.h
      storage/perfschema/table_ews_by_host_by_event_name.cc
      storage/perfschema/table_ews_by_host_by_event_name.h
      storage/perfschema/table_ews_by_user_by_event_name.cc
      storage/perfschema/table_ews_by_user_by_event_name.h
      storage/perfschema/table_hosts.cc
      storage/perfschema/table_hosts.h
      storage/perfschema/table_users.cc
      storage/perfschema/table_users.h
      storage/perfschema/unittest/pfs_account-oom-t.cc
      storage/perfschema/unittest/pfs_host-oom-t.cc
      storage/perfschema/unittest/pfs_user-oom-t.cc
    modified:
      include/mysql/psi/mysql_socket.h
      mysql-test/collections/default.experimental
      mysql-test/include/mrr_tests.inc
      mysql-test/include/subquery.inc
      mysql-test/r/information_schema.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/myisam_mrr.result
      mysql-test/r/myisam_mrr_cost.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/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_none.result
      mysql-test/suite/innodb/r/innodb-zip.result
      mysql-test/suite/innodb/r/innodb_monitor.result
      mysql-test/suite/innodb/t/innodb-zip.test
      mysql-test/suite/innodb/t/innodb_buffer_pool_load-master.opt
      mysql-test/suite/opt_trace/include/general2.inc
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      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/schema.inc
      mysql-test/suite/perfschema/include/stage_setup.inc
      mysql-test/suite/perfschema/include/start_server_common.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/checksum.result
      mysql-test/suite/perfschema/r/csv_table_io.result
      mysql-test/suite/perfschema/r/dml_handler.result
      mysql-test/suite/perfschema/r/event_aggregate.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.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.result
      mysql-test/suite/perfschema/r/start_server_innodb.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_socket_class.result
      mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
      mysql-test/suite/perfschema/r/start_server_no_stage_class.result
      mysql-test/suite/perfschema/r/start_server_no_stages_history.result
      mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
      mysql-test/suite/perfschema/r/start_server_no_statement_class.result
      mysql-test/suite/perfschema/r/start_server_no_statements_history.result
      mysql-test/suite/perfschema/r/start_server_no_statements_history_long.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/table_schema.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/checksum.test
      mysql-test/suite/perfschema/t/disabled.def
      mysql-test/suite/perfschema/t/start_server_nothing-master.opt
      mysql-test/suite/perfschema/t/start_server_nothing.test
      mysql-test/suite/sys_vars/r/all_vars.result
      mysql-test/suite/sys_vars/r/innodb_file_format_check_basic.result
      mysql-test/suite/sys_vars/t/all_vars.test
      mysql-test/suite/sys_vars/t/innodb_file_format_check_basic.test
      mysql-test/t/information_schema.test
      mysys/my_init.c
      mysys/my_thr_init.c
      mysys/mysys_priv.h
      scripts/mysql_system_tables.sql
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_subselect.cc
      sql/rpl_info_file.cc
      sql/sql_select.cc
      sql/sys_vars.cc
      storage/innobase/btr/btr0sea.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0flu.c
      storage/innobase/buf/buf0lru.c
      storage/innobase/buf/buf0rea.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/buf0flu.h
      storage/innobase/include/buf0lru.h
      storage/innobase/include/buf0types.h
      storage/innobase/include/ibuf0ibuf.ic
      storage/innobase/include/srv0mon.h
      storage/innobase/include/srv0srv.h
      storage/innobase/include/trx0sys.h
      storage/innobase/log/log0log.c
      storage/innobase/row/row0sel.c
      storage/innobase/srv/srv0mon.c
      storage/innobase/srv/srv0srv.c
      storage/innobase/trx/trx0sys.c
      storage/perfschema/CMakeLists.txt
      storage/perfschema/ha_perfschema.cc
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_engine_table.cc
      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/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_setup_actor.cc
      storage/perfschema/pfs_setup_object.cc
      storage/perfschema/pfs_stat.h
      storage/perfschema/pfs_visitor.cc
      storage/perfschema/pfs_visitor.h
      storage/perfschema/table_esgs_global_by_event_name.cc
      storage/perfschema/table_esms_global_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_threads.cc
      storage/perfschema/table_threads.h
      storage/perfschema/unittest/CMakeLists.txt
      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_instr_class-oom-t.cc
      storage/perfschema/unittest/stub_pfs_global.h
      support-files/mysql.spec.sh
 3360 Christopher Powers	2011-08-10
      WL#4896 "Performance Schema Net IO"
      
      Disabled socket_summary_by_instance_func.test until fully debugged

    modified:
      include/mysql/psi/psi_abi_v1.h.pp
      mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result
      mysql-test/suite/perfschema/t/disabled.def*
      mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test

Diff too large for email (115179 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (chris.powers:3360 to 3362) Christopher Powers11 Aug