List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:February 25 2011 9:54pm
Subject:bzr push into mysql-trunk branch (chris.powers:3233 to 3236) WL#4896
View as plain text  
 3236 cpowers	2011-02-25
      WL#4896 "Performance Schema Net IO"
      
      - Update aggregate.result

    modified:
      mysql-test/suite/perfschema/r/aggregate.result
 3235 cpowers	2011-02-25
      WL#4896 "Performance Schema Net IO"
      
      - Build break: removed warning

    modified:
      storage/perfschema/pfs_visitor.cc
 3234 cpowers	2011-02-25
      WL#4896 "Performance Schema Net IO"
      
      - Enabled TRUNCATE for socket_summary_by_*
      - Updated aggregate.test for socket IO

    modified:
      mysql-test/suite/perfschema/r/aggregate.result
      mysql-test/suite/perfschema/t/aggregate.test
      mysql-test/suite/perfschema/t/disabled.def
      storage/perfschema/pfs_instr_class.cc
      storage/perfschema/pfs_instr_class.h
      storage/perfschema/table_socket_summary_by_event_name.cc
      storage/perfschema/table_socket_summary_by_event_name.h
      storage/perfschema/table_socket_summary_by_instance.cc
      storage/perfschema/table_socket_summary_by_instance.h
 3233 cpowers	2011-02-23 [merge]
      WL#4896 "Performance Schema Net IO"
      
      Merge with mysql-trunk

    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/collections/test-bt
      mysql-test/collections/test-bt-debug
      mysql-test/collections/test-bt-debug-fast
      mysql-test/collections/test-bt-fast
      mysql-test/r/crash_commit_before.result
      mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result
      mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result
      mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test
      mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test
      mysql-test/t/crash_commit_before-master.opt
      mysql-test/t/crash_commit_before.test
      mysql-test/t/partition-master.opt
      storage/innobase/include/ut0bh.h
      storage/innobase/ut/ut0bh.c
      storage/perfschema/unittest/stub_server_misc.h.moved
    added:
      cmake/info_bin.cmake
      cmake/info_macros.cmake.in
      cmake/info_src.cmake
      include/mysql/service_my_plugin_log.h
      libservices/my_plugin_log_service.c
      mysql-test/collections/default.release
      mysql-test/collections/disabled-daily.list
      mysql-test/extra/rpl_tests/rpl_insert_duplicate.test
      mysql-test/include/check_qep.inc
      mysql-test/include/execute_with_statistics.inc
      mysql-test/include/expect_qep.inc
      mysql-test/include/have_dbi_dbd-mysql.inc
      mysql-test/r/file_contents.result
      mysql-test/r/multi_update_innodb.result
      mysql-test/r/partition_explicit_prune.result
      mysql-test/r/ssl_and_innodb.result
      mysql-test/std_data/checkDBI_DBD-mysql.pl
      mysql-test/suite/binlog/r/rpl_crash_safe_master_checksum.result
      mysql-test/suite/binlog/t/rpl_crash_safe_master_checksum-master.opt
      mysql-test/suite/binlog/t/rpl_crash_safe_master_checksum.test
      mysql-test/suite/innodb/r/innodb-autoinc-56228.result
      mysql-test/suite/innodb/r/innodb_bug30423.result
      mysql-test/suite/innodb/r/innodb_bug53756.result
      mysql-test/suite/innodb/r/innodb_bug59307.result
      mysql-test/suite/innodb/r/innodb_bug60049.result
      mysql-test/suite/innodb/t/innodb-autoinc-56228-master.opt
      mysql-test/suite/innodb/t/innodb-autoinc-56228.test
      mysql-test/suite/innodb/t/innodb_bug30423.test
      mysql-test/suite/innodb/t/innodb_bug53756-master.opt
      mysql-test/suite/innodb/t/innodb_bug53756.test
      mysql-test/suite/innodb/t/innodb_bug59307.test
      mysql-test/suite/innodb/t/innodb_bug60049-master.opt
      mysql-test/suite/innodb/t/innodb_bug60049.test
      mysql-test/suite/parts/inc/partition-dml-1-1-modes.inc
      mysql-test/suite/parts/inc/partition-dml-1-1.inc
      mysql-test/suite/parts/inc/partition-dml-1-10.inc
      mysql-test/suite/parts/inc/partition-dml-1-11.inc
      mysql-test/suite/parts/inc/partition-dml-1-2.inc
      mysql-test/suite/parts/inc/partition-dml-1-3.inc
      mysql-test/suite/parts/inc/partition-dml-1-4.inc
      mysql-test/suite/parts/inc/partition-dml-1-5.inc
      mysql-test/suite/parts/inc/partition-dml-1-6.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-dml-1-9.inc
      mysql-test/suite/parts/inc/partition-dml_cr_tab.inc
      mysql-test/suite/parts/inc/partition-dml_ins_tab.inc
      mysql-test/suite/parts/inc/rpl-partition-dml-1-1.inc
      mysql-test/suite/parts/r/partition-dml-1-1-innodb-modes.result
      mysql-test/suite/parts/r/partition-dml-1-1-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-1-myisam-modes.result
      mysql-test/suite/parts/r/partition-dml-1-1-myisam.result
      mysql-test/suite/parts/r/partition-dml-1-10-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-10-myisam.result
      mysql-test/suite/parts/r/partition-dml-1-11-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-11-myisam.result
      mysql-test/suite/parts/r/partition-dml-1-2-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-2-myisam.result
      mysql-test/suite/parts/r/partition-dml-1-3-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-4-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-5-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-6-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-7-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-8-innodb.result
      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/rpl-partition-dml-1-1-innodb.result
      mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result
      mysql-test/suite/parts/t/partition-dml-1-1-innodb-modes.test
      mysql-test/suite/parts/t/partition-dml-1-1-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-1-myisam-modes.test
      mysql-test/suite/parts/t/partition-dml-1-1-myisam.test
      mysql-test/suite/parts/t/partition-dml-1-10-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-10-myisam.test
      mysql-test/suite/parts/t/partition-dml-1-11-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-11-myisam.test
      mysql-test/suite/parts/t/partition-dml-1-2-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-2-myisam.test
      mysql-test/suite/parts/t/partition-dml-1-3-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-4-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-5-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-6-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-7-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-8-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-9-innodb.test
      mysql-test/suite/parts/t/partition-dml-1-9-myisam.test
      mysql-test/suite/parts/t/rpl-partition-dml-1-1-innodb.test
      mysql-test/suite/parts/t/rpl-partition-dml-1-1-myisam.test
      mysql-test/suite/perfschema/r/all_tests.result
      mysql-test/suite/perfschema/r/ddl_threads.result
      mysql-test/suite/perfschema/r/dml_fs_by_event_name.result
      mysql-test/suite/perfschema/r/dml_fs_by_instance.result
      mysql-test/suite/perfschema/t/all_tests.test
      mysql-test/suite/perfschema/t/ddl_threads.test
      mysql-test/suite/perfschema/t/dml_fs_by_event_name.test
      mysql-test/suite/perfschema/t/dml_fs_by_instance.test
      mysql-test/suite/rpl/r/rpl_crash_safe_master.result
      mysql-test/suite/rpl/r/rpl_insert_duplicate.result
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt
      mysql-test/suite/rpl/t/rpl_crash_safe_master.test
      mysql-test/suite/rpl/t/rpl_insert_duplicate.test
      mysql-test/suite/sys_vars/r/core_file_basic.result
      mysql-test/suite/sys_vars/r/innodb_change_buffer_max_size_basic.result
      mysql-test/suite/sys_vars/r/secure_file_priv2.result
      mysql-test/suite/sys_vars/t/core_file_basic-master.opt
      mysql-test/suite/sys_vars/t/core_file_basic.test
      mysql-test/suite/sys_vars/t/innodb_change_buffer_max_size_basic.test
      mysql-test/suite/sys_vars/t/secure_file_priv2-master.opt
      mysql-test/suite/sys_vars/t/secure_file_priv2.test
      mysql-test/t/file_contents.test
      mysql-test/t/multi_update_innodb.test
      mysql-test/t/partition_explicit_prune.test
      mysql-test/t/ssl_and_innodb.test
      storage/innobase/include/ut0bh.h
      storage/innobase/include/ut0bh.ic
      storage/innobase/ut/ut0bh.c
      unittest/gunit/item-t.cc
      unittest/gunit/test_mdl_context_owner.h
    renamed:
      unittest/mysys/bitmap-t.c => unittest/gunit/my_bitmap-t.cc
    modified:
      .bzr-mysql/default.conf
      .bzrignore
      BUILD/SETUP.sh
      BUILD/build_mccge.sh
      CMakeLists.txt
      README
      client/my_readline.h
      client/mysql.cc
      client/mysqldump.c
      client/mysqltest.cc
      client/readline.cc
      client/sql_string.cc
      client/sql_string.h
      cmake/cpack_source_ignore_files.cmake
      cmake/make_dist.cmake.in
      config.h.cmake
      configure.cmake
      extra/comp_err.c
      include/m_ctype.h
      include/my_base.h
      include/my_bit.h
      include/my_bitmap.h
      include/my_global.h
      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/psi/psi.h
      include/mysql/psi/psi_abi_v1.h.pp
      include/mysql/psi/psi_abi_v2.h.pp
      include/mysql/services.h
      include/mysql_embed.h
      include/service_versions.h
      include/welcome_copyright_notice.h
      libmysqld/CMakeLists.txt
      libservices/CMakeLists.txt
      mysql-test/CMakeLists.txt
      mysql-test/collections/default.daily
      mysql-test/collections/default.experimental
      mysql-test/collections/default.push
      mysql-test/collections/default.weekly
      mysql-test/extra/binlog_tests/ctype_cp932.test
      mysql-test/extra/rpl_tests/rpl_conflicts.test
      mysql-test/extra/rpl_tests/rpl_insert_ignore.test
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
      mysql-test/extra/rpl_tests/rpl_stop_middle_group.test
      mysql-test/include/check-testcase.test
      mysql-test/include/commit.inc
      mysql-test/include/ctype_numconv.inc
      mysql-test/include/gis_keys.inc
      mysql-test/include/icp_tests.inc
      mysql-test/include/mtr_warnings.sql
      mysql-test/include/mysqld--help.inc
      mysql-test/include/mysqlhotcopy.inc
      mysql-test/include/order_by.inc
      mysql-test/include/plugin.defs
      mysql-test/include/range.inc
      mysql-test/include/rpl_sync.inc
      mysql-test/include/subquery.inc
      mysql-test/include/subquery_mat.inc
      mysql-test/include/subquery_sj.inc
      mysql-test/include/subquery_sj_innodb.inc
      mysql-test/include/unsafe_binlog.inc
      mysql-test/include/wait_for_slave_io_error.inc
      mysql-test/include/wait_for_slave_sql_error.inc
      mysql-test/lib/My/SafeProcess.pm
      mysql-test/lib/My/SafeProcess/safe_process.cc
      mysql-test/lib/My/SafeProcess/safe_process_win.cc
      mysql-test/mysql-test-run.pl
      mysql-test/r/alter_table.result
      mysql-test/r/commit_1innodb.result
      mysql-test/r/create.result
      mysql-test/r/csv_not_null.result
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1250_ch.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_eucjpms.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ldml.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/ddl_i18n_koi8r.result
      mysql-test/r/ddl_i18n_utf8.result
      mysql-test/r/delete.result
      mysql-test/r/filesort_debug.result
      mysql-test/r/func_group.result
      mysql-test/r/func_in_all.result
      mysql-test/r/func_rollback.result
      mysql-test/r/func_time.result
      mysql-test/r/gis.result
      mysql-test/r/grant.result
      mysql-test/r/greedy_optimizer.result
      mysql-test/r/group_by.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_mysql_sync.result
      mysql-test/r/insert_select.result
      mysql-test/r/join.result
      mysql-test/r/join_cache_jcl1.result
      mysql-test/r/join_cache_jcl2.result
      mysql-test/r/join_cache_jcl3.result
      mysql-test/r/join_cache_jcl4.result
      mysql-test/r/join_outer.result
      mysql-test/r/join_outer_jcl6.result
      mysql-test/r/limit.result
      mysql-test/r/lock.result
      mysql-test/r/log_state.result
      mysql-test/r/log_tables.result
      mysql-test/r/mdl_sync.result
      mysql-test/r/multi_update.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/mysqldump.result
      mysql-test/r/negation_elimination.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/partition.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_exchange.result
      mysql-test/r/plugin_auth.result
      mysql-test/r/plugin_auth_qa_1.result
      mysql-test/r/ps.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/select_safe.result
      mysql-test/r/signal_code.result
      mysql-test/r/sp-code.result
      mysql-test/r/sp-error.result
      mysql-test/r/status.result
      mysql-test/r/subquery_all.result
      mysql-test/r/subquery_all_jcl6.result
      mysql-test/r/subquery_mat.result
      mysql-test/r/subquery_mat_all.result
      mysql-test/r/subquery_mat_none.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/symlink.result
      mysql-test/r/system_mysql_db.result
      mysql-test/r/trigger.result
      mysql-test/r/type_year.result
      mysql-test/r/unsafe_binlog_innodb.result
      mysql-test/r/user_var.result
      mysql-test/r/variables.result
      mysql-test/r/xa.result
      mysql-test/std_data/Index.xml
      mysql-test/suite/binlog/r/binlog_index.result
      mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test
      mysql-test/suite/binlog/t/binlog_index.test
      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/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_gis.result
      mysql-test/suite/innodb/r/innodb_monitor.result
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/innodb/t/innodb_bug56143.test
      mysql-test/suite/innodb/t/innodb_information_schema.test
      mysql-test/suite/innodb/t/innodb_monitor.test
      mysql-test/suite/parts/inc/partition_fail.inc
      mysql-test/suite/parts/inc/partition_layout_check1.inc
      mysql-test/suite/parts/inc/partition_layout_check2.inc
      mysql-test/suite/parts/r/partition_exch_qa_13.result
      mysql-test/suite/parts/r/partition_exch_qa_2.result
      mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
      mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
      mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
      mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
      mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
      mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
      mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
      mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
      mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
      mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
      mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
      mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
      mysql-test/suite/parts/r/partition_recover_myisam.result
      mysql-test/suite/parts/r/partition_repair_myisam.result
      mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test
      mysql-test/suite/parts/t/partition_alter1_1_myisam.test
      mysql-test/suite/parts/t/partition_alter1_2_myisam.test
      mysql-test/suite/parts/t/partition_basic_myisam.test
      mysql-test/suite/parts/t/partition_debug_myisam.test
      mysql-test/suite/parts/t/partition_engine_myisam.test
      mysql-test/suite/parts/t/partition_exch_qa_14.test
      mysql-test/suite/parts/t/partition_recover_myisam.test
      mysql-test/suite/parts/t/partition_repair_myisam.test
      mysql-test/suite/parts/t/partition_syntax_myisam.test
      mysql-test/suite/perfschema/include/event_aggregate_setup.inc
      mysql-test/suite/perfschema/include/table_aggregate_load.inc
      mysql-test/suite/perfschema/include/table_aggregate_setup.inc
      mysql-test/suite/perfschema/r/ortho_iter.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/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/disabled.def
      mysql-test/suite/perfschema/t/ortho_iter.test
      mysql-test/suite/perfschema/t/start_server_no_cond_class-master.opt
      mysql-test/suite/perfschema/t/start_server_no_cond_inst-master.opt
      mysql-test/suite/perfschema/t/start_server_no_file_class-master.opt
      mysql-test/suite/perfschema/t/start_server_no_file_inst-master.opt
      mysql-test/suite/perfschema/t/start_server_no_mutex_class-master.opt
      mysql-test/suite/perfschema/t/start_server_no_mutex_inst-master.opt
      mysql-test/suite/perfschema/t/start_server_no_rwlock_class-master.opt
      mysql-test/suite/perfschema/t/start_server_no_rwlock_inst-master.opt
      mysql-test/suite/perfschema/t/start_server_no_table_hdl-master.opt
      mysql-test/suite/perfschema/t/start_server_no_table_inst-master.opt
      mysql-test/suite/perfschema/t/start_server_no_thread_class-master.opt
      mysql-test/suite/perfschema/t/start_server_no_thread_inst-master.opt
      mysql-test/suite/rpl/r/rpl_binlog_corruption.result
      mysql-test/suite/rpl/r/rpl_checksum.result
      mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
      mysql-test/suite/rpl/r/rpl_corruption.result
      mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result
      mysql-test/suite/rpl/r/rpl_insert_ignore.result
      mysql-test/suite/rpl/r/rpl_loaddatalocal.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_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_row_conflicts.result
      mysql-test/suite/rpl/r/rpl_row_event_max_size.result
      mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
      mysql-test/suite/rpl/r/rpl_show_errors.result
      mysql-test/suite/rpl/r/rpl_stm_000001.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_conflicts.result
      mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_binlog_corruption.test
      mysql-test/suite/rpl/t/rpl_checksum.test
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
      mysql-test/suite/rpl/t/rpl_corruption.test
      mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test
      mysql-test/suite/rpl/t/rpl_insert_ignore.test
      mysql-test/suite/rpl/t/rpl_loaddatalocal.test
      mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
      mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
      mysql-test/suite/rpl/t/rpl_show_errors.test
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
      mysql-test/suite/rpl/t/rpl_stm_000001.test
      mysql-test/suite/sys_vars/r/all_vars.result
      mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
      mysql-test/suite/sys_vars/r/max_join_size_func.result
      mysql-test/suite/sys_vars/r/slow_query_log_func.result
      mysql-test/suite/sys_vars/r/sql_big_selects_func.result
      mysql-test/suite/sys_vars/t/pfs_events_waits_history_long_size_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_events_waits_history_size_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_cond_classes_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_cond_instances_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_file_classes_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_file_handles_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_file_instances_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_mutex_classes_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_mutex_instances_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_rwlock_classes_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_rwlock_instances_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_table_handles_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_table_instances_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_thread_classes_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_thread_instances_basic-master.opt
      mysql-test/suite/sys_vars/t/slow_query_log_func.test
      mysql-test/t/alter_table.test
      mysql-test/t/create.test
      mysql-test/t/csv_not_null.test
      mysql-test/t/ctype_cp1250_ch.test
      mysql-test/t/ctype_cp1251.test
      mysql-test/t/ctype_eucjpms.test
      mysql-test/t/ctype_ldml.test
      mysql-test/t/delete.test
      mysql-test/t/disabled.def
      mysql-test/t/filesort_debug.test
      mysql-test/t/func_rollback.test
      mysql-test/t/func_time.test
      mysql-test/t/gis.test
      mysql-test/t/grant.test
      mysql-test/t/greedy_optimizer.test
      mysql-test/t/group_by.test
      mysql-test/t/innodb_mysql_sync.test
      mysql-test/t/insert_select.test
      mysql-test/t/join_outer.test
      mysql-test/t/lock.test
      mysql-test/t/log_state.test
      mysql-test/t/log_tables.test
      mysql-test/t/mdl_sync.test
      mysql-test/t/multi_update.test
      mysql-test/t/mysql.test
      mysql-test/t/mysql_cp932.test
      mysql-test/t/mysqlbinlog-cp932.test
      mysql-test/t/mysqldump.test
      mysql-test/t/negation_elimination.test
      mysql-test/t/not_embedded_server.test
      mysql-test/t/optimizer_switch.test
      mysql-test/t/partition.test
      mysql-test/t/partition_binlog.test
      mysql-test/t/partition_error.test
      mysql-test/t/plugin_auth.test
      mysql-test/t/plugin_auth_qa_1.test
      mysql-test/t/ps.test
      mysql-test/t/sp-error.test
      mysql-test/t/symlink.test
      mysql-test/t/trigger.test
      mysql-test/t/type_year.test
      mysql-test/t/user_var.test
      mysql-test/t/variables.test
      mysql-test/t/xa.test
      mysql-test/valgrind.supp
      mysys/charset.c
      mysys/hash.c
      mysys/my_bitmap.c
      mysys/my_conio.c
      mysys/my_fopen.c
      mysys/my_getsystime.c
      mysys/my_handler.c
      mysys/my_handler_errors.h
      mysys/my_rename.c
      plugin/auth/auth_socket.c
      plugin/auth/test_plugin.c
      regex/my_regex.h
      regex/regcomp.c
      regex/reginit.c
      scripts/mysql_config.pl.in
      scripts/mysql_config.sh
      scripts/mysql_system_tables.sql
      scripts/mysql_system_tables_fix.sql
      scripts/mysqldumpslow.sh
      sql-common/client.c
      sql-common/my_time.c
      sql/CMakeLists.txt
      sql/binlog.cc
      sql/binlog.h
      sql/field.cc
      sql/filesort.cc
      sql/gcalc_slicescan.cc
      sql/gcalc_slicescan.h
      sql/ha_ndbcluster_cond.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_func.cc
      sql/item_func.h
      sql/item_geofunc.h
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_subselect.h
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/mdl.cc
      sql/mdl.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/net_serv.cc
      sql/opt_range.cc
      sql/partition_info.cc
      sql/partition_info.h
      sql/protocol.cc
      sql/rpl_info_handler.h
      sql/rpl_injector.cc
      sql/rpl_injector.h
      sql/rpl_master.cc
      sql/rpl_slave.cc
      sql/rpl_slave.h
      sql/set_var.cc
      sql/share/errmsg-utf8.txt
      sql/sp_head.cc
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_cmd.h
      sql/sql_connect.cc
      sql/sql_connect.h
      sql/sql_delete.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_parse.h
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_plugin.h
      sql/sql_plugin_services.h
      sql/sql_select.cc
      sql/sql_show.cc
      sql/sql_string.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_update.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      sql/sys_vars.h
      sql/table.cc
      sql/table.h
      sql/transaction.cc
      sql/unireg.h
      storage/innobase/CMakeLists.txt
      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/buf0flu.c
      storage/innobase/buf/buf0lru.c
      storage/innobase/buf/buf0rea.c
      storage/innobase/dict/dict0dict.c
      storage/innobase/dict/dict0load.c
      storage/innobase/dict/dict0mem.c
      storage/innobase/dict/dict0stats.c
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/ha/ha0ha.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/btr0btr.h
      storage/innobase/include/btr0cur.h
      storage/innobase/include/btr0cur.ic
      storage/innobase/include/btr0types.h
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0flu.h
      storage/innobase/include/buf0lru.h
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0load.h
      storage/innobase/include/dict0mem.h
      storage/innobase/include/dict0priv.ic
      storage/innobase/include/dict0types.h
      storage/innobase/include/ha0ha.h
      storage/innobase/include/ibuf0ibuf.h
      storage/innobase/include/ibuf0ibuf.ic
      storage/innobase/include/lock0lock.h
      storage/innobase/include/lock0priv.h
      storage/innobase/include/log0log.ic
      storage/innobase/include/os0sync.h
      storage/innobase/include/os0sync.ic
      storage/innobase/include/os0thread.h
      storage/innobase/include/page0zip.h
      storage/innobase/include/rem0cmp.h
      storage/innobase/include/rem0cmp.ic
      storage/innobase/include/row0upd.h
      storage/innobase/include/row0vers.h
      storage/innobase/include/srv0mon.h
      storage/innobase/include/srv0mon.ic
      storage/innobase/include/srv0srv.h
      storage/innobase/include/sync0rw.h
      storage/innobase/include/sync0sync.h
      storage/innobase/include/trx0purge.h
      storage/innobase/include/trx0roll.h
      storage/innobase/include/trx0rseg.h
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0sys.ic
      storage/innobase/include/trx0trx.h
      storage/innobase/include/trx0trx.ic
      storage/innobase/include/trx0types.h
      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/log/log0log.c
      storage/innobase/log/log0recv.c
      storage/innobase/mem/mem0mem.c
      storage/innobase/mtr/mtr0log.c
      storage/innobase/os/os0sync.c
      storage/innobase/page/page0cur.c
      storage/innobase/page/page0page.c
      storage/innobase/page/page0zip.c
      storage/innobase/que/que0que.c
      storage/innobase/read/read0read.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/row/row0vers.c
      storage/innobase/scripts/persistent_storage.sql
      storage/innobase/srv/srv0mon.c
      storage/innobase/srv/srv0srv.c
      storage/innobase/srv/srv0start.c
      storage/innobase/sync/sync0arr.c
      storage/innobase/sync/sync0rw.c
      storage/innobase/sync/sync0sync.c
      storage/innobase/trx/trx0i_s.c
      storage/innobase/trx/trx0purge.c
      storage/innobase/trx/trx0roll.c
      storage/innobase/trx/trx0rseg.c
      storage/innobase/trx/trx0sys.c
      storage/innobase/trx/trx0trx.c
      storage/innobase/ut/ut0mem.c
      storage/innobase/ut/ut0ut.c
      storage/myisam/mi_create.c
      storage/perfschema/ha_perfschema.cc
      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_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.h
      storage/perfschema/table_helper.h
      storage/perfschema/table_setup_instruments.cc
      strings/ctype-uca.c
      strings/ctype.c
      support-files/mysql.spec.sh
      tests/mysql_client_test.c
      unittest/README.txt
      unittest/gunit/CMakeLists.txt
      unittest/gunit/mdl-t.cc
      unittest/gunit/mdl_mytap-t.cc
      unittest/mysys/CMakeLists.txt
      unittest/gunit/my_bitmap-t.cc
=== modified file 'mysql-test/suite/perfschema/r/aggregate.result'
--- a/mysql-test/suite/perfschema/r/aggregate.result	2010-11-03 15:42:33 +0000
+++ b/mysql-test/suite/perfschema/r/aggregate.result	2011-02-25 21:49:11 +0000
@@ -4,6 +4,8 @@ update performance_schema.setup_instrume
 update performance_schema.setup_consumers set enabled = 'NO';
 truncate table performance_schema.file_summary_by_event_name;
 truncate table performance_schema.file_summary_by_instance;
+truncate table performance_schema.socket_summary_by_event_name;
+truncate table performance_schema.socket_summary_by_instance;
 truncate table performance_schema.events_waits_summary_global_by_event_name;
 truncate table performance_schema.events_waits_summary_by_instance;
 truncate table performance_schema.events_waits_summary_by_thread_by_event_name;
@@ -32,6 +34,20 @@ JOIN performance_schema.file_summary_by_
 GROUP BY EVENT_NAME
 HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE))
 OR @dump_all;
+EVENT_NAME	COUNT_WRITE	SUM(i.COUNT_WRITE)
+SELECT EVENT_NAME, e.COUNT_READ, SUM(i.COUNT_READ)
+FROM performance_schema.socket_summary_by_event_name AS e
+JOIN performance_schema.socket_summary_by_instance AS i USING (EVENT_NAME)
+GROUP BY EVENT_NAME
+HAVING (e.COUNT_READ <> SUM(i.COUNT_READ))
+OR @dump_all;
+EVENT_NAME	COUNT_READ	SUM(i.COUNT_READ)
+SELECT EVENT_NAME, e.COUNT_WRITE, SUM(i.COUNT_WRITE)
+FROM performance_schema.socket_summary_by_event_name AS e
+JOIN performance_schema.socket_summary_by_instance AS i USING (EVENT_NAME)
+GROUP BY EVENT_NAME
+HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE))
+OR @dump_all;
 EVENT_NAME	COUNT_WRITE	SUM(i.COUNT_WRITE)
 SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_READ, SUM(i.SUM_NUMBER_OF_BYTES_READ)
 FROM performance_schema.file_summary_by_event_name AS e

=== modified file 'mysql-test/suite/perfschema/t/aggregate.test'
--- a/mysql-test/suite/perfschema/t/aggregate.test	2010-11-08 19:35:17 +0000
+++ b/mysql-test/suite/perfschema/t/aggregate.test	2011-02-25 21:12:43 +0000
@@ -31,6 +31,8 @@ update performance_schema.setup_consumer
 # Cleanup statistics
 truncate table performance_schema.file_summary_by_event_name;
 truncate table performance_schema.file_summary_by_instance;
+truncate table performance_schema.socket_summary_by_event_name;
+truncate table performance_schema.socket_summary_by_instance;
 truncate table performance_schema.events_waits_summary_global_by_event_name;
 truncate table performance_schema.events_waits_summary_by_instance;
 truncate table performance_schema.events_waits_summary_by_thread_by_event_name;
@@ -113,6 +115,20 @@ JOIN performance_schema.file_summary_by_
 GROUP BY EVENT_NAME
 HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE))
 OR @dump_all;
+
+SELECT EVENT_NAME, e.COUNT_READ, SUM(i.COUNT_READ)
+FROM performance_schema.socket_summary_by_event_name AS e
+JOIN performance_schema.socket_summary_by_instance AS i USING (EVENT_NAME)
+GROUP BY EVENT_NAME
+HAVING (e.COUNT_READ <> SUM(i.COUNT_READ))
+OR @dump_all;
+
+SELECT EVENT_NAME, e.COUNT_WRITE, SUM(i.COUNT_WRITE)
+FROM performance_schema.socket_summary_by_event_name AS e
+JOIN performance_schema.socket_summary_by_instance AS i USING (EVENT_NAME)
+GROUP BY EVENT_NAME
+HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE))
+OR @dump_all;
 
 SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_READ, SUM(i.SUM_NUMBER_OF_BYTES_READ)
 FROM performance_schema.file_summary_by_event_name AS e

=== modified file 'mysql-test/suite/perfschema/t/disabled.def'
--- a/mysql-test/suite/perfschema/t/disabled.def	2011-02-23 21:13:48 +0000
+++ b/mysql-test/suite/perfschema/t/disabled.def	2011-02-25 21:12:43 +0000
@@ -45,7 +45,7 @@ start_server_no_table_inst
 start_server_nothing                    : WL#4896 Perfschema NET IO - temporary
 start_server_no_thread_class            : WL#4896 Perfschema NET IO - temporary
 start_server_no_thread_inst             : WL#4896 Perfschema NET IO - temporary
-aggregate                               : WL#4896 Perfschema NET IO - temporary
+#aggregate                               : WL#4896 Perfschema NET IO - temporary
 csv_table_io                            : WL#4896 Perfschema NET IO - temporary
 indexed_table_io                        : WL#4896 Perfschema NET IO - temporary
 start_server_on                         : WL#4896 Perfschema NET IO - temporary

=== modified file 'storage/perfschema/pfs_instr_class.cc'
--- a/storage/perfschema/pfs_instr_class.cc	2011-02-23 21:13:48 +0000
+++ b/storage/perfschema/pfs_instr_class.cc	2011-02-25 21:12:43 +0000
@@ -1197,5 +1197,15 @@ void reset_file_class_io(void)
     pfs->m_file_stat.m_io_stat.reset();
 }
 
+/** Reset the io statistics per socket class. */
+void reset_socket_class_io(void)
+{
+  PFS_socket_class *pfs= socket_class_array;
+  PFS_socket_class *pfs_last= socket_class_array + socket_class_max;
+
+  for ( ; pfs < pfs_last; pfs++)
+    pfs->m_socket_stat.m_io_stat.reset();
+}
+
 /** @} */
 

=== modified file 'storage/perfschema/pfs_instr_class.h'
--- a/storage/perfschema/pfs_instr_class.h	2011-02-16 22:53:35 +0000
+++ b/storage/perfschema/pfs_instr_class.h	2011-02-25 21:12:43 +0000
@@ -379,6 +379,7 @@ extern ulong table_share_lost;
 extern PFS_table_share *table_share_array;
 
 void reset_file_class_io();
+void reset_socket_class_io();
 
 /** @} */
 #endif

=== modified file 'storage/perfschema/pfs_visitor.cc'
--- a/storage/perfschema/pfs_visitor.cc	2011-02-18 22:33:11 +0000
+++ b/storage/perfschema/pfs_visitor.cc	2011-02-25 21:19:58 +0000
@@ -524,7 +524,6 @@ PFS_instance_socket_io_stat_visitor::~PF
 
 void PFS_instance_socket_io_stat_visitor::visit_socket_class(PFS_socket_class *pfs) 
 {
-  uint index= pfs->m_event_name_index;
   m_socket_io_stat.aggregate(&pfs->m_socket_stat.m_io_stat);
 }
 

=== modified file 'storage/perfschema/table_socket_summary_by_event_name.cc'
--- a/storage/perfschema/table_socket_summary_by_event_name.cc	2011-02-18 22:33:11 +0000
+++ b/storage/perfschema/table_socket_summary_by_event_name.cc	2011-02-25 21:12:43 +0000
@@ -477,7 +477,7 @@ table_socket_summary_by_event_name::m_sh
   &pfs_readonly_acl,
   &table_socket_summary_by_event_name::create,
   NULL, /* write_row */
-  NULL, /* delete_all_rows */
+  table_socket_summary_by_event_name::delete_all_rows,
   NULL, /* get_row_count */
   1000, /* records */ // TBD: Check this
   sizeof(PFS_simple_index),
@@ -496,6 +496,13 @@ table_socket_summary_by_event_name::tabl
   m_row_exists(false), m_pos(1), m_next_pos(1)
 {}
 
+int table_socket_summary_by_event_name::delete_all_rows(void)
+{
+  reset_socket_instance_io();
+  reset_socket_class_io();
+  return 0;
+}
+
 void table_socket_summary_by_event_name::reset_position(void)
 {
   m_pos.m_index= 1;

=== modified file 'storage/perfschema/table_socket_summary_by_event_name.h'
--- a/storage/perfschema/table_socket_summary_by_event_name.h	2011-02-18 22:33:11 +0000
+++ b/storage/perfschema/table_socket_summary_by_event_name.h	2011-02-25 21:12:43 +0000
@@ -52,6 +52,7 @@ public:
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
+  static int delete_all_rows();
 
   virtual int rnd_next();
   virtual int rnd_pos(const void *pos);

=== modified file 'storage/perfschema/table_socket_summary_by_instance.cc'
--- a/storage/perfschema/table_socket_summary_by_instance.cc	2011-02-18 22:33:11 +0000
+++ b/storage/perfschema/table_socket_summary_by_instance.cc	2011-02-25 21:12:43 +0000
@@ -486,7 +486,7 @@ table_socket_summary_by_instance::m_shar
   &pfs_readonly_acl,
   &table_socket_summary_by_instance::create,
   NULL, /* write_row */
-  NULL, /* delete_all_rows */
+  table_socket_summary_by_instance::delete_all_rows,
   NULL, /* get_row_count */
   1000, /* records */ // TBD: Check this
   sizeof(PFS_simple_index),
@@ -505,6 +505,12 @@ table_socket_summary_by_instance::table_
   m_row_exists(false), m_pos(0), m_next_pos(0)
 {}
 
+int table_socket_summary_by_instance::delete_all_rows(void)
+{
+  reset_socket_instance_io();
+  return 0;
+}
+
 void table_socket_summary_by_instance::reset_position(void)
 {
   m_pos.m_index= 0;

=== modified file 'storage/perfschema/table_socket_summary_by_instance.h'
--- a/storage/perfschema/table_socket_summary_by_instance.h	2011-02-04 22:00:44 +0000
+++ b/storage/perfschema/table_socket_summary_by_instance.h	2011-02-25 21:12:43 +0000
@@ -55,6 +55,7 @@ public:
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
+  static int delete_all_rows();
 
   virtual int rnd_next();
   virtual int rnd_pos(const void *pos);


Attachment: [text/bzr-bundle] bzr/cpowers@tma-1-20110225214911-wvbr4ey5fqgar5kg.bundle
Thread
bzr push into mysql-trunk branch (chris.powers:3233 to 3236) WL#4896Christopher Powers25 Feb