List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:September 9 2010 8:57pm
Subject:bzr push into mysql-next-mr-wl4896 branch (chris.powers:3167 to 3168) WL#4896
View as plain text  
 3168 Christopher Powers	2010-09-09
      WL#4896 "PEFORMANCE_SCHEMA Net IO"
      
      Getting PB green: Updated MTR tests to accommodate socket stats.
     @ mysql-test/suite/perfschema/t/aggregate.test
        Ignore socket instances for this test.

    modified:
      mysql-test/suite/perfschema/r/aggregate.result
      mysql-test/suite/perfschema/r/csv_table_io.result
      mysql-test/suite/perfschema/r/indexed_table_io.result
      mysql-test/suite/perfschema/r/information_schema.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_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/t/aggregate.test
 3167 Christopher Powers	2010-09-09 [merge]
      merge

    removed:
      BUILD/compile-pentium-mysqlfs-debug
      include/mysql/plugin.h.pp
      mysql-test/include/have_thread_concurrency.inc
      mysql-test/r/join_optimizer.result
      mysql-test/r/subselect2.result
      mysql-test/r/subselect3.result
      mysql-test/r/subselect4.result
      mysql-test/suite/parts/inc/partition_crash.inc
      mysql-test/suite/parts/r/partition_debug_innodb.result
      mysql-test/suite/parts/t/partition_debug_innodb-master.opt
      mysql-test/suite/parts/t/partition_debug_innodb.test
      mysql-test/suite/perfschema/r/ddl_ews_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_processlist.result
      mysql-test/suite/perfschema/r/ddl_setup_objects.result
      mysql-test/suite/perfschema/r/dml_ews_by_event_name.result
      mysql-test/suite/perfschema/r/dml_processlist.result
      mysql-test/suite/perfschema/r/dml_setup_objects.result
      mysql-test/suite/perfschema/t/ddl_ews_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_processlist.test
      mysql-test/suite/perfschema/t/ddl_setup_objects.test
      mysql-test/suite/perfschema/t/dml_ews_by_event_name.test
      mysql-test/suite/perfschema/t/dml_processlist.test
      mysql-test/suite/perfschema/t/dml_setup_objects.test
      mysql-test/suite/rpl/t/rpl_mixed_row_innodb.test
      mysql-test/t/join_optimizer.test
      mysql-test/t/subselect2.test
      mysql-test/t/subselect3.test
      mysql-test/t/subselect4.test
      storage/perfschema/table_processlist.cc
      storage/perfschema/table_processlist.h
      storage/perfschema/table_setup_objects.cc
      storage/perfschema/table_setup_objects.h
    added:
      include/mysql/plugin_audit.h.pp
      include/mysql/plugin_ftparser.h.pp
      include/mysql/service_thd_wait.h
      include/mysql/service_thread_scheduler.h
      libservices/my_thread_scheduler_service.c
      libservices/thd_wait_service.c
      mysql-test/include/have_engine_condition_pushdown.inc
      mysql-test/include/have_firstmatch.inc
      mysql-test/include/have_index_condition_pushdown.inc
      mysql-test/include/have_join_cache_level.inc
      mysql-test/include/have_loosescan.inc
      mysql-test/include/have_materialization.inc
      mysql-test/include/have_mrr.inc
      mysql-test/include/have_semijoin.inc
      mysql-test/include/icp_tests.inc
      mysql-test/include/join_cache.inc
      mysql-test/include/mrr_innodb_tests.inc
      mysql-test/include/mrr_tests.inc
      mysql-test/include/mysql_upgrade_preparation.inc
      mysql-test/include/not_blackhole.inc
      mysql-test/include/subquery_mat.inc
      mysql-test/include/subquery_sj.inc
      mysql-test/include/subquery_sj_innodb.inc
      mysql-test/include/world.inc
      mysql-test/include/world_schema.inc
      mysql-test/include/world_schema1.inc
      mysql-test/r/ctype_utf16_def.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_none.result
      mysql-test/r/handler_read_last.result
      mysql-test/r/have_optimizer_switch.require
      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_icp.result
      mysql-test/r/innodb_mrr_none.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_cache_jcl5.result
      mysql-test/r/join_cache_jcl6.result
      mysql-test/r/join_cache_jcl7.result
      mysql-test/r/join_cache_jcl8.result
      mysql-test/r/join_nested_jcl6.result
      mysql-test/r/join_optimizer.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_icp.result
      mysql-test/r/myisam_mrr_none.result
      mysql-test/r/mysql_not_windows.result
      mysql-test/r/mysql_upgrade_ssl.result
      mysql-test/r/null_key_icp.result
      mysql-test/r/null_key_none.result
      mysql-test/r/optimizer_switch.result
      mysql-test/r/order_by_icp_mrr.result
      mysql-test/r/order_by_none.result
      mysql-test/r/partition_not_blackhole.result
      mysql-test/r/range_icp.result
      mysql-test/r/range_icp_mrr.result
      mysql-test/r/range_mrr.result
      mysql-test/r/range_none.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/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/std_data/parts/t1_blackhole.frm
      mysql-test/std_data/parts/t1_blackhole.par
      mysql-test/suite/binlog/r/binlog_mixed_load_data.result
      mysql-test/suite/binlog/t/binlog_mixed_load_data.test
      mysql-test/suite/optimizer_unfixed_bugs/
      mysql-test/suite/optimizer_unfixed_bugs/README.txt
      mysql-test/suite/optimizer_unfixed_bugs/r/
      mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result
      mysql-test/suite/optimizer_unfixed_bugs/r/bug49129.result
      mysql-test/suite/optimizer_unfixed_bugs/t/
      mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
      mysql-test/suite/optimizer_unfixed_bugs/t/bug49129.test
      mysql-test/suite/parts/inc/partition_crash.inc
      mysql-test/suite/parts/inc/partition_crash_add.inc
      mysql-test/suite/parts/inc/partition_crash_change.inc
      mysql-test/suite/parts/inc/partition_crash_drop.inc
      mysql-test/suite/parts/inc/partition_fail.inc
      mysql-test/suite/parts/inc/partition_fail_add.inc
      mysql-test/suite/parts/inc/partition_fail_change.inc
      mysql-test/suite/parts/inc/partition_fail_drop.inc
      mysql-test/suite/parts/inc/partition_mgm_crash.inc
      mysql-test/suite/parts/r/part_ctype_utf32.result
      mysql-test/suite/parts/r/partition_debug_innodb.result
      mysql-test/suite/parts/r/partition_debug_myisam.result
      mysql-test/suite/parts/t/part_ctype_utf32.test
      mysql-test/suite/parts/t/partition_debug_innodb-master.opt
      mysql-test/suite/parts/t/partition_debug_innodb.test
      mysql-test/suite/parts/t/partition_debug_myisam-master.opt
      mysql-test/suite/parts/t/partition_debug_myisam.test
      mysql-test/suite/perfschema/r/bad_option_3.result
      mysql-test/suite/perfschema/r/bad_option_4.result
      mysql-test/suite/perfschema/r/bad_option_5.result
      mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_threads.result
      mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
      mysql-test/suite/perfschema/r/dml_threads.result
      mysql-test/suite/perfschema/r/short_option_1.result
      mysql-test/suite/perfschema/r/short_option_2.result
      mysql-test/suite/perfschema/t/bad_option_3.test
      mysql-test/suite/perfschema/t/bad_option_4.test
      mysql-test/suite/perfschema/t/bad_option_5.test
      mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_threads.test
      mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test
      mysql-test/suite/perfschema/t/dml_threads.test
      mysql-test/suite/perfschema/t/short_option_1-master.opt
      mysql-test/suite/perfschema/t/short_option_1.test
      mysql-test/suite/perfschema/t/short_option_2-master.opt
      mysql-test/suite/perfschema/t/short_option_2.test
      mysql-test/suite/rpl/r/rpl_change_master_dbug.result
      mysql-test/suite/rpl/r/rpl_show_errors.result
      mysql-test/suite/rpl/t/rpl_change_master_dbug.test
      mysql-test/suite/rpl/t/rpl_show_errors.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt
      mysql-test/suite/sys_vars/r/optimizer_join_cache_level_basic.result
      mysql-test/suite/sys_vars/t/optimizer_join_cache_level_basic.test
      mysql-test/t/ctype_utf16_def-master.opt
      mysql-test/t/ctype_utf16_def.test
      mysql-test/t/func_in_all.test
      mysql-test/t/func_in_icp.test
      mysql-test/t/func_in_icp_mrr.test
      mysql-test/t/func_in_mrr.test
      mysql-test/t/func_in_none.test
      mysql-test/t/handler_read_last.test
      mysql-test/t/innodb_icp.test
      mysql-test/t/innodb_icp_all.test
      mysql-test/t/innodb_icp_none.test
      mysql-test/t/innodb_mrr-master.opt
      mysql-test/t/innodb_mrr.test
      mysql-test/t/innodb_mrr_all-master.opt
      mysql-test/t/innodb_mrr_all.test
      mysql-test/t/innodb_mrr_icp-master.opt
      mysql-test/t/innodb_mrr_icp.test
      mysql-test/t/innodb_mrr_none-master.opt
      mysql-test/t/innodb_mrr_none.test
      mysql-test/t/join_cache_jcl1.test
      mysql-test/t/join_cache_jcl2.test
      mysql-test/t/join_cache_jcl3.test
      mysql-test/t/join_cache_jcl4.test
      mysql-test/t/join_cache_jcl5.test
      mysql-test/t/join_cache_jcl6.test
      mysql-test/t/join_cache_jcl7.test
      mysql-test/t/join_cache_jcl8.test
      mysql-test/t/join_nested_jcl6.test
      mysql-test/t/join_optimizer.test
      mysql-test/t/join_outer_jcl6.test
      mysql-test/t/myisam_icp.test
      mysql-test/t/myisam_icp_all.test
      mysql-test/t/myisam_icp_none.test
      mysql-test/t/myisam_mrr.test
      mysql-test/t/myisam_mrr_all.test
      mysql-test/t/myisam_mrr_icp.test
      mysql-test/t/myisam_mrr_none.test
      mysql-test/t/mysql_not_windows.test
      mysql-test/t/mysql_upgrade_ssl.test
      mysql-test/t/null_key_all.test
      mysql-test/t/null_key_icp.test
      mysql-test/t/null_key_none.test
      mysql-test/t/optimizer_switch.test
      mysql-test/t/order_by_all.test
      mysql-test/t/order_by_icp_mrr.test
      mysql-test/t/order_by_none.test
      mysql-test/t/partition_not_blackhole-master.opt
      mysql-test/t/partition_not_blackhole.test
      mysql-test/t/range_all.test
      mysql-test/t/range_icp.test
      mysql-test/t/range_icp_mrr.test
      mysql-test/t/range_mrr.test
      mysql-test/t/range_none.test
      mysql-test/t/select_all.test
      mysql-test/t/select_all_jcl6.test
      mysql-test/t/select_icp_mrr.test
      mysql-test/t/select_icp_mrr_jcl6.test
      mysql-test/t/select_none.test
      mysql-test/t/select_none_jcl6.test
      mysql-test/t/ssl_8k_key-master.opt
      mysql-test/t/subquery_all.test
      mysql-test/t/subquery_all_jcl6.test
      mysql-test/t/subquery_mat.test
      mysql-test/t/subquery_mat_all.test
      mysql-test/t/subquery_mat_none.test
      mysql-test/t/subquery_nomat_nosj.test
      mysql-test/t/subquery_nomat_nosj_jcl6.test
      mysql-test/t/subquery_none.test
      mysql-test/t/subquery_none_jcl6.test
      mysql-test/t/subquery_sj_all.test
      mysql-test/t/subquery_sj_all_jcl6.test
      mysql-test/t/subquery_sj_all_jcl7.test
      mysql-test/t/subquery_sj_dupsweed.test
      mysql-test/t/subquery_sj_dupsweed_jcl6.test
      mysql-test/t/subquery_sj_dupsweed_jcl7.test
      mysql-test/t/subquery_sj_firstmatch.test
      mysql-test/t/subquery_sj_firstmatch_jcl6.test
      mysql-test/t/subquery_sj_firstmatch_jcl7.test
      mysql-test/t/subquery_sj_innodb_all.test
      mysql-test/t/subquery_sj_innodb_all_jcl6.test
      mysql-test/t/subquery_sj_innodb_all_jcl7.test
      mysql-test/t/subquery_sj_innodb_none.test
      mysql-test/t/subquery_sj_innodb_none_jcl6.test
      mysql-test/t/subquery_sj_innodb_none_jcl7.test
      mysql-test/t/subquery_sj_loosescan.test
      mysql-test/t/subquery_sj_loosescan_jcl6.test
      mysql-test/t/subquery_sj_loosescan_jcl7.test
      mysql-test/t/subquery_sj_mat.test
      mysql-test/t/subquery_sj_mat_jcl6.test
      mysql-test/t/subquery_sj_mat_jcl7.test
      mysql-test/t/subquery_sj_mat_nosj.test
      mysql-test/t/subquery_sj_none.test
      mysql-test/t/subquery_sj_none_jcl6.test
      mysql-test/t/subquery_sj_none_jcl7.test
      sql/sql_admin.cc
      sql/sql_admin.h
      sql/sql_callback.h
      sql/sql_cmd.h
      sql/sql_join_cache.cc
      sql/sql_reload.cc
      sql/sql_reload.h
      storage/perfschema/table_ews_global_by_event_name.cc
      storage/perfschema/table_ews_global_by_event_name.h
      storage/perfschema/table_threads.cc
      storage/perfschema/table_threads.h
    renamed:
      mysql-test/r/func_in.result => mysql-test/r/func_in_all.result
      mysql-test/r/null_key.result => mysql-test/r/null_key_all.result
      mysql-test/r/order_by.result => mysql-test/r/order_by_all.result
      mysql-test/r/range.result => mysql-test/r/range_all.result
      mysql-test/r/select.result => mysql-test/r/select_all.result
      mysql-test/r/subselect.result => mysql-test/r/subquery_all.result
      mysql-test/t/func_in.test => mysql-test/include/func_in.inc
      mysql-test/t/null_key.test => mysql-test/include/null_key.inc
      mysql-test/t/order_by.test => mysql-test/include/order_by.inc
      mysql-test/t/range.test => mysql-test/include/range.inc
      mysql-test/t/select.test => mysql-test/include/select.inc
      mysql-test/t/subselect.test => mysql-test/include/subquery.inc
      sql/sql_alter_table.cc => sql/sql_alter.cc
      sql/sql_alter_table.h => sql/sql_alter.h
    modified:
      .bzrignore
      BUILD/Makefile.am
      BUILD/SETUP.sh
      BUILD/build_mccge.sh
      BUILD/check-cpu
      BUILD/compile-ndb-autotest
      BUILD/compile-pentium-debug
      BUILD/compile-pentium-debug-max
      BUILD/compile-pentium-debug-max-no-ndb
      BUILD/compile-pentium-debug-openssl
      BUILD/compile-pentium-debug-yassl
      BUILD/compile-pentium64-debug
      BUILD/compile-pentium64-debug-max
      CMakeLists.txt
      Makefile.am
      README
      client/CMakeLists.txt
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqltest.cc
      client/sql_string.cc
      cmake/abi_check.cmake
      cmake/configure.pl
      cmake/do_abi_check.cmake
      cmake/plugin.cmake
      cmd-line-utils/libedit/CMakeLists.txt
      cmd-line-utils/readline/CMakeLists.txt
      config/ac-macros/ha_ndbcluster.m4
      config/ac-macros/plugins.m4
      configure.in
      dbug/CMakeLists.txt
      extra/CMakeLists.txt
      extra/yassl/CMakeLists.txt
      extra/yassl/taocrypt/CMakeLists.txt
      extra/yassl/taocrypt/src/coding.cpp
      include/CMakeLists.txt
      include/Makefile.am
      include/my_base.h
      include/my_handler.h
      include/my_pthread.h
      include/myisam.h
      include/mysql/plugin.h
      include/mysql/psi/mysql_thread.h
      include/mysql/services.h
      include/service_versions.h
      include/thr_lock.h
      include/violite.h
      libmysql/CMakeLists.txt
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
      libmysqld/examples/CMakeLists.txt
      libmysqld/lib_sql.cc
      libservices/CMakeLists.txt
      libservices/Makefile.am
      man/CMakeLists.txt
      mysql-test/CMakeLists.txt
      mysql-test/collections/default.experimental
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
      mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test
      mysql-test/extra/rpl_tests/create_recursive_construct.inc
      mysql-test/extra/rpl_tests/rpl_conflicts.test
      mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc
      mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.test
      mysql-test/extra/rpl_tests/rpl_innodb.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_no_concurrent_insert.inc
      mysql-test/include/commit.inc
      mysql-test/include/common-tests.inc
      mysql-test/include/ctype_numconv.inc
      mysql-test/include/deadlock.inc
      mysql-test/include/handler.inc
      mysql-test/include/index_merge_ror_cpk.inc
      mysql-test/include/mix1.inc
      mysql-test/include/mix2.inc
      mysql-test/include/mysqlhotcopy.inc
      mysql-test/include/ps_modify.inc
      mysql-test/include/wait_for_slave_io_error.inc
      mysql-test/include/wait_for_slave_sql_error.inc
      mysql-test/lib/My/Config.pm
      mysql-test/lib/My/ConfigFactory.pm
      mysql-test/lib/My/SafeProcess.pm
      mysql-test/lib/My/SafeProcess/CMakeLists.txt
      mysql-test/lib/mtr_cases.pm
      mysql-test/lib/mtr_report.pm
      mysql-test/lib/v1/mysql-test-run.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/archive_gis.result
      mysql-test/r/auto_increment.result
      mysql-test/r/case.result
      mysql-test/r/commit_1innodb.result
      mysql-test/r/compress.result
      mysql-test/r/create.result
      mysql-test/r/csv.result
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_cp932_binlog_stm.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf32.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/ctype_utf8mb4.result
      mysql-test/r/ctype_utf8mb4_heap.result
      mysql-test/r/ctype_utf8mb4_innodb.result
      mysql-test/r/ctype_utf8mb4_myisam.result
      mysql-test/r/ctype_utf8mb4_ndb.result
      mysql-test/r/delayed.result
      mysql-test/r/delete.result
      mysql-test/r/derived.result
      mysql-test/r/distinct.result
      mysql-test/r/endspace.result
      mysql-test/r/events_trans.result
      mysql-test/r/explain.result
      mysql-test/r/flush.result
      mysql-test/r/func_analyse.result
      mysql-test/r/func_concat.result
      mysql-test/r/func_gconcat.result
      mysql-test/r/func_group.result
      mysql-test/r/func_group_innodb.result
      mysql-test/r/func_if.result
      mysql-test/r/func_misc.result
      mysql-test/r/func_str.result
      mysql-test/r/func_time.result
      mysql-test/r/gis.result
      mysql-test/r/greedy_optimizer.result
      mysql-test/r/group_by.result
      mysql-test/r/group_min_max.result
      mysql-test/r/having.result
      mysql-test/r/heap.result
      mysql-test/r/index_merge_myisam.result
      mysql-test/r/information_schema.result
      mysql-test/r/information_schema_inno.result
      mysql-test/r/insert.result
      mysql-test/r/insert_select.result
      mysql-test/r/join.result
      mysql-test/r/join_nested.result
      mysql-test/r/join_outer.result
      mysql-test/r/join_outer_innodb.result
      mysql-test/r/key.result
      mysql-test/r/key_cache.result
      mysql-test/r/key_diff.result
      mysql-test/r/locale.result
      mysql-test/r/lowercase_table.result
      mysql-test/r/mdl_sync.result
      mysql-test/r/merge.result
      mysql-test/r/myisam.result
      mysql-test/r/mysql_client_test.result
      mysql-test/r/mysqlbinlog.result
      mysql-test/r/mysqlbinlog_row.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result*
      mysql-test/r/mysqltest.result
      mysql-test/r/named_pipe.result*
      mysql-test/r/negation_elimination.result
      mysql-test/r/not_partition.result
      mysql-test/r/partition.result
      mysql-test/r/partition_disabled.result
      mysql-test/r/partition_exchange.result
      mysql-test/r/partition_innodb.result
      mysql-test/r/partition_pruning.result
      mysql-test/r/partition_range.result
      mysql-test/r/partition_truncate.result
      mysql-test/r/ps_ddl.result
      mysql-test/r/query_cache.result
      mysql-test/r/row.result
      mysql-test/r/rowid_order_innodb.result
      mysql-test/r/schema.result
      mysql-test/r/select_safe.result
      mysql-test/r/shm.result*
      mysql-test/r/single_delete_update.result
      mysql-test/r/sp-lock.result
      mysql-test/r/sp-threads.result
      mysql-test/r/sp.result
      mysql-test/r/ssl.result
      mysql-test/r/ssl_compress.result
      mysql-test/r/status.result
      mysql-test/r/subselect_debug.result
      mysql-test/r/subselect_innodb.result
      mysql-test/r/subselect_notembedded.result
      mysql-test/r/sum_distinct.result
      mysql-test/r/trigger.result
      mysql-test/r/type_bit_innodb.result
      mysql-test/r/type_date.result
      mysql-test/r/type_datetime.result
      mysql-test/r/union.result
      mysql-test/r/update.result
      mysql-test/r/view.result
      mysql-test/std_data/server8k-cert.pem
      mysql-test/std_data/server8k-key.pem
      mysql-test/suite/binlog/r/binlog_database.result
      mysql-test/suite/binlog/r/binlog_innodb_row.result
      mysql-test/suite/binlog/r/binlog_row_binlog.result
      mysql-test/suite/binlog/r/binlog_row_drop_tbl.result
      mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
      mysql-test/suite/binlog/r/binlog_stm_binlog.result
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result
      mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result
      mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
      mysql-test/suite/binlog/r/binlog_stm_row.result
      mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
      mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/binlog/t/binlog_killed_simulate.test
      mysql-test/suite/binlog/t/binlog_stm_blackhole.test
      mysql-test/suite/binlog/t/binlog_stm_row.test
      mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test
      mysql-test/suite/binlog/t/binlog_unsafe.test
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/funcs_1/datadict/processlist_val.inc
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
      mysql-test/suite/funcs_1/r/innodb_trig_03.result
      mysql-test/suite/funcs_1/r/innodb_trig_03e.result
      mysql-test/suite/funcs_1/r/innodb_trig_0407.result
      mysql-test/suite/funcs_1/r/innodb_trig_08.result
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result
      mysql-test/suite/funcs_1/r/memory_trig_03.result
      mysql-test/suite/funcs_1/r/memory_trig_03e.result
      mysql-test/suite/funcs_1/r/memory_trig_0407.result
      mysql-test/suite/funcs_1/r/memory_trig_08.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
      mysql-test/suite/funcs_1/r/myisam_trig_03.result
      mysql-test/suite/funcs_1/r/myisam_trig_03e.result
      mysql-test/suite/funcs_1/r/myisam_trig_0407.result
      mysql-test/suite/funcs_1/r/myisam_trig_08.result
      mysql-test/suite/funcs_1/r/ndb_storedproc_06.result
      mysql-test/suite/funcs_1/r/ndb_storedproc_10.result
      mysql-test/suite/funcs_1/r/ndb_trig_03.result
      mysql-test/suite/funcs_1/r/ndb_trig_03e.result
      mysql-test/suite/funcs_1/r/ndb_trig_0407.result
      mysql-test/suite/funcs_1/r/ndb_trig_08.result
      mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
      mysql-test/suite/funcs_1/r/processlist_val_ps.result
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
      mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
      mysql-test/suite/funcs_1/triggers/triggers_03.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc
      mysql-test/suite/funcs_1/triggers/triggers_0407.inc
      mysql-test/suite/funcs_1/triggers/triggers_08.inc
      mysql-test/suite/funcs_2/charset/charset_master.test
      mysql-test/suite/funcs_2/r/innodb_charset.result
      mysql-test/suite/funcs_2/r/memory_charset.result
      mysql-test/suite/funcs_2/r/myisam_charset.result
      mysql-test/suite/funcs_2/t/disabled.def
      mysql-test/suite/innodb/r/innodb_gis.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb-lock.test
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result
      mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result
      mysql-test/suite/ndb/r/ndb_binlog_log_bin.result
      mysql-test/suite/ndb/r/ndb_binlog_multi.result
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/r/ndb_cursor.result
      mysql-test/suite/ndb/r/ndb_gis.result
      mysql-test/suite/ndb/r/ndb_read_multi_range.result
      mysql-test/suite/ndb/t/ndb_read_multi_range.test
      mysql-test/suite/parts/inc/partition_mgm.inc
      mysql-test/suite/parts/r/partition_debug_sync_innodb.result
      mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
      mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
      mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
      mysql-test/suite/parts/r/partition_special_innodb.result
      mysql-test/suite/parts/r/partition_special_myisam.result
      mysql-test/suite/parts/t/partition_debug_sync_innodb.test
      mysql-test/suite/parts/t/partition_special_innodb-master.opt
      mysql-test/suite/parts/t/partition_special_innodb.test
      mysql-test/suite/parts/t/partition_special_myisam.test
      mysql-test/suite/perfschema/include/setup_helper.inc
      mysql-test/suite/perfschema/include/start_server_common.inc
      mysql-test/suite/perfschema/r/aggregate.result
      mysql-test/suite/perfschema/r/binlog_mix.result
      mysql-test/suite/perfschema/r/binlog_row.result
      mysql-test/suite/perfschema/r/binlog_stmt.result
      mysql-test/suite/perfschema/r/dml_setup_instruments.result
      mysql-test/suite/perfschema/r/func_file_io.result
      mysql-test/suite/perfschema/r/information_schema.result
      mysql-test/suite/perfschema/r/misc.result
      mysql-test/suite/perfschema/r/no_threads.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
      mysql-test/suite/perfschema/r/schema.result
      mysql-test/suite/perfschema/r/selects.result
      mysql-test/suite/perfschema/r/server_init.result
      mysql-test/suite/perfschema/t/aggregate.test
      mysql-test/suite/perfschema/t/func_file_io.test
      mysql-test/suite/perfschema/t/misc.test
      mysql-test/suite/perfschema/t/no_threads.test
      mysql-test/suite/perfschema/t/schema.test
      mysql-test/suite/perfschema/t/selects.test
      mysql-test/suite/perfschema/t/start_server_no_thread_class.test
      mysql-test/suite/perfschema/t/start_server_no_thread_inst.test
      mysql-test/suite/perfschema/t/start_server_nothing.test
      mysql-test/suite/perfschema/t/thread_cache.test
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_conditional_comments.result
      mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result
      mysql-test/suite/rpl/r/rpl_drop_if_exists.result
      mysql-test/suite/rpl/r/rpl_flush_logs.result
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
      mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_row_drop.result
      mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_row_log.result
      mysql-test/suite/rpl/r/rpl_row_log_innodb.result
      mysql-test/suite/rpl/r/rpl_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
      mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result
      mysql-test/suite/rpl/r/rpl_server_id.result
      mysql-test/suite/rpl/r/rpl_sp.result
      mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
      mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_stm_log.result
      mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_binlog_corruption.test
      mysql-test/suite/rpl/t/rpl_bug38694.test
      mysql-test/suite/rpl/t/rpl_change_master.test
      mysql-test/suite/rpl/t/rpl_create_if_not_exists.test
      mysql-test/suite/rpl/t/rpl_drop.test
      mysql-test/suite/rpl/t/rpl_flush_logs.test
      mysql-test/suite/rpl/t/rpl_loaddata.test
      mysql-test/suite/rpl/t/rpl_loaddata_fatal.test
      mysql-test/suite/rpl/t/rpl_loaddata_map.test
      mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
      mysql-test/suite/rpl/t/rpl_packet.test
      mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test
      mysql-test/suite/rpl/t/rpl_savepoint.test
      mysql-test/suite/rpl/t/rpl_server_id1.test
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
      mysql-test/suite/rpl/t/rpl_sp.test
      mysql-test/suite/rpl/t/rpl_stm_innodb.test
      mysql-test/suite/rpl/t/rpl_stm_log.test
      mysql-test/suite/rpl/t/rpl_temporary_errors.test
      mysql-test/suite/rpl/t/rpl_view_multi.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_implicit_commit_binlog.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_row_implicit_commit_binlog.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
      mysql-test/suite/rpl_ndb/t/disabled.def
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt
      mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc
      mysql-test/suite/sys_vars/r/concurrent_insert_func.result
      mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result
      mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
      mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
      mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result
      mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result
      mysql-test/suite/sys_vars/t/concurrent_insert_func.test
      mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test
      mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test
      mysql-test/suite/sys_vars/t/secure_file_priv.test
      mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
      mysql-test/suite/sys_vars/t/thread_concurrency_basic.test
      mysql-test/t/auto_increment.test
      mysql-test/t/case.test
      mysql-test/t/create.test
      mysql-test/t/csv.test
      mysql-test/t/ctype_utf32.test
      mysql-test/t/ctype_utf8.test
      mysql-test/t/delayed.test
      mysql-test/t/delete.test
      mysql-test/t/disabled.def
      mysql-test/t/endspace.test
      mysql-test/t/events_trans.test
      mysql-test/t/explain.test
      mysql-test/t/flush.test
      mysql-test/t/func_analyse.test
      mysql-test/t/func_gconcat.test
      mysql-test/t/func_group.test
      mysql-test/t/func_if.test
      mysql-test/t/func_misc.test
      mysql-test/t/func_str.test
      mysql-test/t/func_time.test
      mysql-test/t/group_by.test
      mysql-test/t/having.test
      mysql-test/t/information_schema.test
      mysql-test/t/information_schema_inno.test
      mysql-test/t/innodb_mysql_lock.test
      mysql-test/t/innodb_mysql_lock2.test
      mysql-test/t/insert.test
      mysql-test/t/insert_notembedded.test
      mysql-test/t/join_outer.test
      mysql-test/t/key.test
      mysql-test/t/kill.test
      mysql-test/t/lock_multi.test
      mysql-test/t/lock_sync.test
      mysql-test/t/lowercase_table.test
      mysql-test/t/mdl_sync.test
      mysql-test/t/merge-big.test
      mysql-test/t/merge.test
      mysql-test/t/multi_update.test
      mysql-test/t/myisam.test
      mysql-test/t/mysql_client_test.test
      mysql-test/t/mysql_upgrade.test
      mysql-test/t/mysqlbinlog.test
      mysql-test/t/mysqltest.test
      mysql-test/t/not_partition.test
      mysql-test/t/optimizer_switch_eng_cond_pushdown1.test
      mysql-test/t/optimizer_switch_eng_cond_pushdown2.test
      mysql-test/t/partition.test
      mysql-test/t/partition_debug_sync.test
      mysql-test/t/partition_exchange.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/partition_range.test
      mysql-test/t/partition_truncate.test
      mysql-test/t/query_cache.test
      mysql-test/t/query_cache_28249.test
      mysql-test/t/schema.test
      mysql-test/t/single_delete_update.test
      mysql-test/t/sp-lock.test
      mysql-test/t/sp_notembedded.test
      mysql-test/t/sp_sync.test
      mysql-test/t/status.test
      mysql-test/t/subselect_debug.test
      mysql-test/t/subselect_innodb.test
      mysql-test/t/subselect_notembedded.test
      mysql-test/t/sum_distinct.test
      mysql-test/t/trigger.test
      mysql-test/t/trigger_notembedded.test
      mysql-test/t/type_datetime.test
      mysql-test/t/union.test
      mysql-test/t/view.test
      mysys/CMakeLists.txt
      mysys/my_getopt.c
      mysys/my_init.c
      mysys/my_open.c
      mysys/my_thr_init.c
      mysys/stacktrace.c
      mysys/thr_lock.c
      mysys/thr_rwlock.c
      plugin/audit_null/CMakeLists.txt
      plugin/audit_null/audit_null.c
      plugin/daemon_example/CMakeLists.txt
      plugin/fulltext/CMakeLists.txt
      plugin/semisync/CMakeLists.txt
      regex/CMakeLists.txt
      scripts/CMakeLists.txt
      scripts/mysql_config.sh
      scripts/mysql_system_tables.sql
      scripts/mysqlaccess.conf*
      sql-bench/CMakeLists.txt
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/authors.h
      sql/binlog.cc
      sql/binlog.h
      sql/datadict.cc
      sql/datadict.h
      sql/event_db_repository.cc
      sql/events.cc
      sql/events.h
      sql/examples/CMakeLists.txt
      sql/field.cc
      sql/field.h
      sql/filesort.cc
      sql/gen_lex_hash.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      sql/ha_ndbcluster_cond.cc
      sql/ha_ndbcluster_cond.h
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_buff.cc
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_func.cc
      sql/item_func.h
      sql/item_row.cc
      sql/item_row.h
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/item_sum.cc
      sql/item_sum.h
      sql/key.cc
      sql/lex.h
      sql/lock.cc
      sql/lock.h
      sql/log.cc
      sql/log_event.cc
      sql/mdl.cc
      sql/mdl.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/opt_range.cc
      sql/opt_range.h
      sql/opt_sum.cc
      sql/partition_info.h
      sql/records.cc
      sql/records.h
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_reporting.cc
      sql/rpl_reporting.h
      sql/rpl_slave.cc
      sql/rpl_slave.h
      sql/scheduler.cc
      sql/scheduler.h
      sql/set_var.cc
      sql/share/CMakeLists.txt
      sql/sp_head.cc
      sql/sql_acl.cc
      sql/sql_acl.h
      sql/sql_array.h
      sql/sql_audit.cc
      sql/sql_audit.h
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_bitmap.h
      sql/sql_bootstrap.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_connect.h
      sql/sql_const.h
      sql/sql_cursor.cc
      sql/sql_db.cc
      sql/sql_delete.cc
      sql/sql_delete.h
      sql/sql_derived.cc
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_handler.cc
      sql/sql_insert.cc
      sql/sql_insert.h
      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_partition_admin.cc
      sql/sql_partition_admin.h
      sql/sql_plugin.cc
      sql/sql_plugin_services.h
      sql/sql_prepare.cc
      sql/sql_priv.h
      sql/sql_rename.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_servers.cc
      sql/sql_show.cc
      sql/sql_signal.cc
      sql/sql_signal.h
      sql/sql_string.cc
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_test.cc
      sql/sql_test.h
      sql/sql_trigger.cc
      sql/sql_truncate.cc
      sql/sql_truncate.h
      sql/sql_union.cc
      sql/sql_update.cc
      sql/sql_update.h
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/structs.h
      sql/sys_vars.cc
      sql/sys_vars.h
      sql/table.cc
      sql/table.h
      storage/archive/CMakeLists.txt
      storage/blackhole/CMakeLists.txt
      storage/csv/CMakeLists.txt
      storage/example/CMakeLists.txt
      storage/federated/CMakeLists.txt
      storage/heap/CMakeLists.txt
      storage/ibmdb2i/CMakeLists.txt
      storage/innobase/CMakeLists.txt
      storage/innobase/btr/btr0cur.c
      storage/innobase/btr/btr0sea.c
      storage/innobase/buf/buf0flu.c
      storage/innobase/buf/buf0rea.c
      storage/innobase/dict/dict0load.c
      storage/innobase/ha/ha0ha.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/i_s.cc
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/btr0cur.h
      storage/innobase/include/btr0sea.h
      storage/innobase/include/dict0load.h
      storage/innobase/include/ha0ha.h
      storage/innobase/include/ha_prototypes.h
      storage/innobase/include/ibuf0ibuf.ic
      storage/innobase/include/row0mysql.h
      storage/innobase/include/univ.i
      storage/innobase/plug.in
      storage/innobase/row/row0sel.c
      storage/innobase/srv/srv0srv.c
      storage/myisam/CMakeLists.txt
      storage/myisam/ft_stopwords.c
      storage/myisam/ha_myisam.cc
      storage/myisam/ha_myisam.h
      storage/myisam/mi_dynrec.c
      storage/myisam/mi_extra.c
      storage/myisam/mi_key.c
      storage/myisam/mi_packrec.c
      storage/myisam/mi_rkey.c
      storage/myisam/mi_rnext.c
      storage/myisam/mi_rnext_same.c
      storage/myisam/mi_rprev.c
      storage/myisam/mi_scan.c
      storage/myisam/mi_static.c
      storage/myisam/myisamdef.h
      storage/myisammrg/CMakeLists.txt
      storage/perfschema/CMakeLists.txt
      storage/perfschema/Makefile.am
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/pfs_events_waits.cc
      storage/perfschema/pfs_events_waits.h
      storage/perfschema/pfs_server.h
      storage/perfschema/pfs_stat.h
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits_summary.cc
      storage/perfschema/table_events_waits_summary.h
      strings/CMakeLists.txt
      strings/ctype-latin1.c
      support-files/CMakeLists.txt
      support-files/my-innodb-heavy-4G.cnf.sh
      support-files/mysql.spec.sh
      tests/CMakeLists.txt
      tests/mysql_client_test.c
      unittest/examples/CMakeLists.txt
      unittest/mysys/CMakeLists.txt
      unittest/mytap/CMakeLists.txt
      vio/CMakeLists.txt
      vio/vio.c
      vio/vio_priv.h
      vio/viosocket.c
      vio/viossl.c
      zlib/CMakeLists.txt
      mysql-test/r/func_in_all.result
      mysql-test/r/null_key_all.result
      mysql-test/r/order_by_all.result
      mysql-test/r/range_all.result
      mysql-test/r/select_all.result
      mysql-test/r/subquery_all.result
      mysql-test/include/null_key.inc
      mysql-test/include/order_by.inc
      mysql-test/include/range.inc
      mysql-test/include/select.inc
      mysql-test/include/subquery.inc
      sql/sql_alter.cc
      sql/sql_alter.h
=== modified file 'mysql-test/suite/perfschema/r/aggregate.result'
--- a/mysql-test/suite/perfschema/r/aggregate.result	2010-08-12 14:08:52 +0000
+++ b/mysql-test/suite/perfschema/r/aggregate.result	2010-09-09 20:56:38 +0000
@@ -51,6 +51,7 @@ EVENT_NAME	SUM_NUMBER_OF_BYTES_WRITE	SUM
 SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(i.SUM_TIMER_WAIT)
 FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e
 JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME)
+WHERE EVENT_NAME NOT LIKE '%io/socket%'
 GROUP BY EVENT_NAME
 HAVING (e.SUM_TIMER_WAIT < SUM(i.SUM_TIMER_WAIT))
 OR @dump_all;
@@ -63,9 +64,11 @@ HAVING (e.MIN_TIMER_WAIT > MIN(i.MIN_TIM
 AND (MIN(i.MIN_TIMER_WAIT) != 0)
 OR @dump_all;
 EVENT_NAME	MIN_TIMER_WAIT	MIN(i.MIN_TIMER_WAIT)
+wait/io/socket/sql/handle_connection	1916096	1904064
 SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(i.MAX_TIMER_WAIT)
 FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e
 JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME)
+WHERE EVENT_NAME NOT LIKE '%io/socket%'
 GROUP BY EVENT_NAME
 HAVING (e.MAX_TIMER_WAIT < MAX(i.MAX_TIMER_WAIT))
 OR @dump_all;
@@ -75,6 +78,7 @@ SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM
 FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e
 JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t
 USING (EVENT_NAME)
+WHERE EVENT_NAME NOT LIKE '%io/socket%'
 GROUP BY EVENT_NAME
 HAVING (e.SUM_TIMER_WAIT < SUM(t.SUM_TIMER_WAIT))
 OR @dump_all;
@@ -83,6 +87,7 @@ SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN
 FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e
 JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t
 USING (EVENT_NAME)
+WHERE EVENT_NAME NOT LIKE '%io/socket%'
 GROUP BY EVENT_NAME
 HAVING (e.MIN_TIMER_WAIT > MIN(t.MIN_TIMER_WAIT))
 AND (MIN(t.MIN_TIMER_WAIT) != 0)
@@ -92,6 +97,7 @@ SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX
 FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e
 JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t
 USING (EVENT_NAME)
+WHERE EVENT_NAME NOT LIKE '%io/socket%'
 GROUP BY EVENT_NAME
 HAVING (e.MAX_TIMER_WAIT < MAX(t.MAX_TIMER_WAIT))
 OR @dump_all;

=== modified file 'mysql-test/suite/perfschema/r/csv_table_io.result'
--- a/mysql-test/suite/perfschema/r/csv_table_io.result	2010-07-13 14:17:39 +0000
+++ b/mysql-test/suite/perfschema/r/csv_table_io.result	2010-09-09 20:56:38 +0000
@@ -122,6 +122,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_socket_instances_lost	0
 Performance_schema_table_handles_lost	0
 Performance_schema_table_instances_lost	0
 Performance_schema_thread_classes_lost	0

=== modified file 'mysql-test/suite/perfschema/r/indexed_table_io.result'
--- a/mysql-test/suite/perfschema/r/indexed_table_io.result	2010-07-13 14:17:39 +0000
+++ b/mysql-test/suite/perfschema/r/indexed_table_io.result	2010-09-09 20:56:38 +0000
@@ -135,6 +135,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_socket_instances_lost	0
 Performance_schema_table_handles_lost	0
 Performance_schema_table_instances_lost	0
 Performance_schema_thread_classes_lost	0

=== modified file 'mysql-test/suite/perfschema/r/information_schema.result'
--- a/mysql-test/suite/perfschema/r/information_schema.result	2010-08-12 14:08:52 +0000
+++ b/mysql-test/suite/perfschema/r/information_schema.result	2010-09-09 20:56:38 +0000
@@ -18,6 +18,7 @@ performance_schema	RWLOCK_INSTANCES	def
 performance_schema	SETUP_CONSUMERS	def
 performance_schema	SETUP_INSTRUMENTS	def
 performance_schema	SETUP_TIMERS	def
+performance_schema	SOCKET_INSTANCES	def
 performance_schema	THREADS	def
 select upper(TABLE_NAME), TABLE_TYPE, ENGINE
 from information_schema.tables
@@ -39,6 +40,7 @@ RWLOCK_INSTANCES	BASE TABLE	PERFORMANCE_
 SETUP_CONSUMERS	BASE TABLE	PERFORMANCE_SCHEMA
 SETUP_INSTRUMENTS	BASE TABLE	PERFORMANCE_SCHEMA
 SETUP_TIMERS	BASE TABLE	PERFORMANCE_SCHEMA
+SOCKET_INSTANCES	BASE TABLE	PERFORMANCE_SCHEMA
 THREADS	BASE TABLE	PERFORMANCE_SCHEMA
 select upper(TABLE_NAME), VERSION, ROW_FORMAT
 from information_schema.tables
@@ -60,6 +62,7 @@ RWLOCK_INSTANCES	10	Dynamic
 SETUP_CONSUMERS	10	Dynamic
 SETUP_INSTRUMENTS	10	Dynamic
 SETUP_TIMERS	10	Dynamic
+SOCKET_INSTANCES	10	Dynamic
 THREADS	10	Dynamic
 select upper(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH
 from information_schema.tables
@@ -81,6 +84,7 @@ RWLOCK_INSTANCES	1000	0
 SETUP_CONSUMERS	8	0
 SETUP_INSTRUMENTS	1000	0
 SETUP_TIMERS	1	0
+SOCKET_INSTANCES	1000	0
 THREADS	1000	0
 select upper(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH
 from information_schema.tables
@@ -102,6 +106,7 @@ RWLOCK_INSTANCES	0	0
 SETUP_CONSUMERS	0	0
 SETUP_INSTRUMENTS	0	0
 SETUP_TIMERS	0	0
+SOCKET_INSTANCES	0	0
 THREADS	0	0
 select upper(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT
 from information_schema.tables
@@ -123,6 +128,7 @@ RWLOCK_INSTANCES	0	0	NULL
 SETUP_CONSUMERS	0	0	NULL
 SETUP_INSTRUMENTS	0	0	NULL
 SETUP_TIMERS	0	0	NULL
+SOCKET_INSTANCES	0	0	NULL
 THREADS	0	0	NULL
 select upper(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME
 from information_schema.tables
@@ -144,6 +150,7 @@ RWLOCK_INSTANCES	NULL	NULL	NULL
 SETUP_CONSUMERS	NULL	NULL	NULL
 SETUP_INSTRUMENTS	NULL	NULL	NULL
 SETUP_TIMERS	NULL	NULL	NULL
+SOCKET_INSTANCES	NULL	NULL	NULL
 THREADS	NULL	NULL	NULL
 select upper(TABLE_NAME), TABLE_COLLATION, CHECKSUM
 from information_schema.tables
@@ -165,6 +172,7 @@ RWLOCK_INSTANCES	utf8_general_ci	NULL
 SETUP_CONSUMERS	utf8_general_ci	NULL
 SETUP_INSTRUMENTS	utf8_general_ci	NULL
 SETUP_TIMERS	utf8_general_ci	NULL
+SOCKET_INSTANCES	utf8_general_ci	NULL
 THREADS	utf8_general_ci	NULL
 select upper(TABLE_NAME), TABLE_COMMENT
 from information_schema.tables
@@ -186,4 +194,5 @@ RWLOCK_INSTANCES
 SETUP_CONSUMERS	
 SETUP_INSTRUMENTS	
 SETUP_TIMERS	
+SOCKET_INSTANCES	
 THREADS	

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_cond_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000000
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	1000000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_cond_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000000
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	1000000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_file_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000000
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	1000000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_file_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000000
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	1000000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_mutex_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	0
 performance_schema_max_mutex_instances	1000000
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	1000000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	0
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	1000000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000000
 performance_schema_max_rwlock_classes	0
 performance_schema_max_rwlock_instances	1000000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000000
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	0
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_table_hdl.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000000
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	1000000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	0
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_table_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000000
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	1000000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	0
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_thread_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000000
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	1000000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	0

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_thread_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000000
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	1000000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50

=== modified file 'mysql-test/suite/perfschema/r/start_server_nothing.result'
--- a/mysql-test/suite/perfschema/r/start_server_nothing.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_nothing.result	2010-09-09 20:56:38 +0000
@@ -13,7 +13,7 @@ count(*)
 8
 select count(*) > 1 from performance_schema.SETUP_INSTRUMENTS;
 count(*) > 1
-0
+1
 select count(*) from performance_schema.SETUP_TIMERS;
 count(*)
 1
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	0
 performance_schema_max_mutex_instances	0
 performance_schema_max_rwlock_classes	0
 performance_schema_max_rwlock_instances	0
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	0
 performance_schema_max_table_instances	0
 performance_schema_max_thread_classes	0
@@ -68,6 +70,8 @@ performance_schema_max_mutex_classes	0
 performance_schema_max_mutex_instances	0
 performance_schema_max_rwlock_classes	0
 performance_schema_max_rwlock_instances	0
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	0
 performance_schema_max_table_instances	0
 performance_schema_max_thread_classes	0
@@ -75,6 +79,8 @@ performance_schema_max_thread_instances
 select * from performance_schema.SETUP_INSTRUMENTS;
 NAME	ENABLED	TIMED
 wait/io/table/sql/handler	YES	YES
+wait/io/socket/sql/network_init	YES	YES
+wait/io/socket/sql/handle_connection	YES	YES
 select TIMER_NAME from performance_schema.PERFORMANCE_TIMERS;
 TIMER_NAME
 CYCLE
@@ -109,6 +115,8 @@ select * from performance_schema.EVENTS_
 THREAD_ID	EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT
 select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME;
 EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT
+wait/io/socket/sql/network_init	0	0	0	0	0
+wait/io/socket/sql/handle_connection	0	0	0	0	0
 select * from performance_schema.FILE_INSTANCES;
 FILE_NAME	EVENT_NAME	OPEN_COUNT
 select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME;

=== modified file 'mysql-test/suite/perfschema/r/start_server_off.result'
--- a/mysql-test/suite/perfschema/r/start_server_off.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_off.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000000
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	1000000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50
@@ -66,6 +68,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_socket_instances_lost	0
 Performance_schema_table_handles_lost	0
 Performance_schema_table_instances_lost	0
 Performance_schema_thread_classes_lost	0

=== modified file 'mysql-test/suite/perfschema/r/start_server_on.result'
--- a/mysql-test/suite/perfschema/r/start_server_on.result	2010-09-09 18:08:04 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_on.result	2010-09-09 20:56:38 +0000
@@ -48,6 +48,8 @@ performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	1000000
 performance_schema_max_rwlock_classes	30
 performance_schema_max_rwlock_instances	1000000
+performance_schema_max_socket_classes	50
+performance_schema_max_sockets	10000
 performance_schema_max_table_handles	10000
 performance_schema_max_table_instances	1000
 performance_schema_max_thread_classes	50
@@ -66,6 +68,7 @@ Performance_schema_mutex_classes_lost	0
 Performance_schema_mutex_instances_lost	0
 Performance_schema_rwlock_classes_lost	0
 Performance_schema_rwlock_instances_lost	0
+Performance_schema_socket_instances_lost	0
 Performance_schema_table_handles_lost	0
 Performance_schema_table_instances_lost	0
 Performance_schema_thread_classes_lost	0

=== modified file 'mysql-test/suite/perfschema/t/aggregate.test'
--- a/mysql-test/suite/perfschema/t/aggregate.test	2010-08-12 15:25:01 +0000
+++ b/mysql-test/suite/perfschema/t/aggregate.test	2010-09-09 20:56:38 +0000
@@ -133,6 +133,7 @@ OR @dump_all;
 SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(i.SUM_TIMER_WAIT)
 FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e
 JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME)
+WHERE EVENT_NAME NOT LIKE '%io/socket%'
 GROUP BY EVENT_NAME
 HAVING (e.SUM_TIMER_WAIT < SUM(i.SUM_TIMER_WAIT))
 OR @dump_all;
@@ -148,6 +149,7 @@ OR @dump_all;
 SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(i.MAX_TIMER_WAIT)
 FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e
 JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME)
+WHERE EVENT_NAME NOT LIKE '%io/socket%'
 GROUP BY EVENT_NAME
 HAVING (e.MAX_TIMER_WAIT < MAX(i.MAX_TIMER_WAIT))
 OR @dump_all;
@@ -158,6 +160,7 @@ SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM
 FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e
 JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t
 USING (EVENT_NAME)
+WHERE EVENT_NAME NOT LIKE '%io/socket%'
 GROUP BY EVENT_NAME
 HAVING (e.SUM_TIMER_WAIT < SUM(t.SUM_TIMER_WAIT))
 OR @dump_all;
@@ -166,6 +169,7 @@ SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN
 FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e
 JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t
 USING (EVENT_NAME)
+WHERE EVENT_NAME NOT LIKE '%io/socket%'
 GROUP BY EVENT_NAME
 HAVING (e.MIN_TIMER_WAIT > MIN(t.MIN_TIMER_WAIT))
 AND (MIN(t.MIN_TIMER_WAIT) != 0)
@@ -175,6 +179,7 @@ SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX
 FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e
 JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t
 USING (EVENT_NAME)
+WHERE EVENT_NAME NOT LIKE '%io/socket%'
 GROUP BY EVENT_NAME
 HAVING (e.MAX_TIMER_WAIT < MAX(t.MAX_TIMER_WAIT))
 OR @dump_all;


Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20100909205638-zpzu0ijqyf9blbgy.bundle
Thread
bzr push into mysql-next-mr-wl4896 branch (chris.powers:3167 to 3168) WL#4896Christopher Powers9 Sep