List:Commits« Previous MessageNext Message »
From:Marc Alff Date:May 18 2011 4:02pm
Subject:bzr push into mysql-trunk-wl5342 branch (marc.alff:3368 to 3369)
View as plain text  
 3369 Marc Alff	2011-05-18
      Integrated the table instrumentation with the table open cache.

    modified:
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h.pp
      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_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_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_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
      sql/sql_base.cc
      storage/perfschema/pfs.cc
 3368 Marc Alff	2011-05-18 [merge]
      Merge mysql-trunk --> mysql-trunk-wl5342

    removed:
      mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test
      mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test
      mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test
      mysql-test/suite/perfschema/t/schema_lc0.test
      mysql-test/suite/perfschema/t/schema_lc1.test
      mysql-test/suite/perfschema/t/schema_lc2.test
    added:
      mysql-test/extra/rpl_tests/rpl_temp_error.test
      mysql-test/include/start_slave_io.inc
      mysql-test/include/start_slave_sql.inc
      mysql-test/lib/mtr_results.pm
      mysql-test/r/implicit_char_to_num_conversion.result
      mysql-test/suite/perfschema/r/pfs_upgrade.result
      mysql-test/suite/perfschema/r/schema.result
      mysql-test/suite/perfschema/t/pfs_upgrade.test
      mysql-test/suite/perfschema/t/schema.test
      mysql-test/suite/rpl/r/rpl_DML_error.result
      mysql-test/suite/rpl/t/rpl_DML_error.test
      mysql-test/t/implicit_char_to_num_conversion.test
      unittest/gunit/opt_range-t.cc
      unittest/gunit/test_utils.cc
      unittest/gunit/test_utils.h
    renamed:
      mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result => mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result.THIS
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result => mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result.THIS
      mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result => mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result.THIS
      mysql-test/suite/perfschema/r/schema_lc0.result => mysql-test/suite/perfschema/r/schema_lc0.result.THIS
      mysql-test/suite/perfschema/r/schema_lc1.result => mysql-test/suite/perfschema/r/schema_lc1.result.THIS
      mysql-test/suite/perfschema/r/schema_lc2.result => mysql-test/suite/perfschema/r/schema_lc2.result.THIS
    modified:
      .bzrignore
      BUILD/SETUP.sh
      CMakeLists.txt
      client/mysql.cc*
      client/mysqlbinlog.cc
      client/mysqltest.cc
      extra/replace.c
      include/mysql.h
      include/mysql.h.pp
      libmysql/libmysql.c
      mysql-test/collections/default.experimental
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
      mysql-test/extra/rpl_tests/check_type.inc
      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_mixing_engines.inc
      mysql-test/include/wait_show_condition.inc
      mysql-test/lib/My/CoreDump.pm
      mysql-test/lib/My/Test.pm
      mysql-test/lib/mtr_report.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/distinct.result
      mysql-test/r/explain.result
      mysql-test/r/having.result
      mysql-test/r/innodb_mysql_lock.result
      mysql-test/r/metadata.result
      mysql-test/r/mysqlbinlog_base64.result
      mysql-test/r/mysqldump.result
      mysql-test/r/read_only_innodb.result
      mysql-test/r/trigger.result
      mysql-test/r/type_newdecimal.result
      mysql-test/r/type_ranges.result
      mysql-test/r/variables-big.result
      mysql-test/suite/binlog/r/binlog_innodb_row.result
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
      mysql-test/suite/binlog/t/binlog_bug23533.test
      mysql-test/suite/binlog/t/binlog_innodb_row.test
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/r/rpl_crash_safe_master.result
      mysql-test/suite/rpl/r/rpl_loaddatalocal.result
      mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.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_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
      mysql-test/suite/rpl/r/rpl_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_server_id2.result
      mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
      mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_stm_innodb.result
      mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_typeconv.result
      mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
      mysql-test/suite/rpl/t/rpl_crash_safe_master.test
      mysql-test/suite/rpl/t/rpl_loaddatalocal.test
      mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
      mysql-test/suite/rpl/t/rpl_row_until.test
      mysql-test/suite/rpl/t/rpl_server_id2.test
      mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
      mysql-test/suite/rpl/t/rpl_typeconv.test
      mysql-test/t/distinct.test
      mysql-test/t/explain.test
      mysql-test/t/having.test
      mysql-test/t/innodb_mysql_lock.test
      mysql-test/t/mysqlbinlog_base64.test
      mysql-test/t/mysqlbinlog_raw_mode.test
      mysql-test/t/mysqldump.test
      mysql-test/t/trigger.test
      mysql-test/t/type_newdecimal.test
      mysql-test/t/variables-big.test
      mysys/lf_alloc-pin.c
      mysys/thr_alarm.c
      packaging/WiX/ca/CMakeLists.txt
      packaging/WiX/create_msi.cmake.in
      packaging/WiX/custom_ui.wxs
      scripts/make_win_bin_dist
      scripts/mysql_system_tables.sql
      sql/binlog.cc
      sql/binlog.h
      sql/field.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_row.cc
      sql/item_strfunc.cc
      sql/item_xmlfunc.cc
      sql/item_xmlfunc.h
      sql/log_event.cc
      sql/my_decimal.cc
      sql/my_decimal.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/opt_range.cc
      sql/protocol.cc
      sql/rpl_info_file.cc
      sql/rpl_injector.cc
      sql/rpl_injector.h
      sql/rpl_master.cc
      sql/rpl_reporting.cc
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_slave.cc
      sql/share/errmsg-utf8.txt
      sql/sp_head.cc
      sql/sql_acl.cc
      sql/sql_analyse.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_delete.cc
      sql/sql_insert.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_priv.h
      sql/sql_select.cc
      sql/sql_table.cc
      sql/sql_truncate.cc
      sql/sql_update.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      sql/transaction.cc
      storage/archive/ha_archive.cc
      storage/innobase/handler/i_s.cc
      storage/ndb/src/kernel/blocks/lgman.cpp
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/pfs_instr_class.cc
      storage/perfschema/pfs_instr_class.h
      storage/perfschema/pfs_setup_object.h
      storage/perfschema/table_setup_instruments.cc
      storage/perfschema/table_setup_instruments.h
      strings/decimal.c
      unittest/gunit/CMakeLists.txt
      unittest/gunit/item-t.cc
      unittest/mysys/lf-t.c
      vio/viosocket.c
=== modified file 'include/mysql/psi/psi.h'
--- a/include/mysql/psi/psi.h	2011-04-26 20:35:24 +0000
+++ b/include/mysql/psi/psi.h	2011-05-18 16:02:19 +0000
@@ -968,6 +968,23 @@ typedef struct PSI_table* (*open_table_v
   (struct PSI_table_share *share, const void *identity);
 
 /**
+  Unbind a table handle from the current thread.
+  This operation happens when an opened table is added to the open table cache.
+  @param table the table to unbind
+*/
+typedef void (*unbind_table_v1_t)
+  (struct PSI_table *table);
+
+/**
+  Rebind a table handle to the current thread.
+  This operation happens when a table from the open table cache
+  is reused for a thread.
+  @param table the table to unbind
+*/
+typedef void (*rebind_table_v1_t)
+  (struct PSI_table *table);
+
+/**
   Close an instrumentation table handle.
   Note that the table handle is invalid after this call.
   @param table the table handle to close
@@ -1591,6 +1608,10 @@ struct PSI_v1
   drop_table_share_v1_t drop_table_share;
   /** @sa open_table_v1_t. */
   open_table_v1_t open_table;
+  /** @sa unbind_table_v1_t. */
+  unbind_table_v1_t unbind_table;
+  /** @sa rebind_table_v1_t. */
+  rebind_table_v1_t rebind_table;
   /** @sa close_table_v1_t. */
   close_table_v1_t close_table;
   /** @sa create_file_v1_t. */

=== modified file 'include/mysql/psi/psi_abi_v1.h.pp'
--- a/include/mysql/psi/psi_abi_v1.h.pp	2011-02-14 14:23:55 +0000
+++ b/include/mysql/psi/psi_abi_v1.h.pp	2011-05-18 16:02:19 +0000
@@ -239,6 +239,10 @@ typedef void (*drop_table_share_v1_t)
    const char *table_name, int table_name_length);
 typedef struct PSI_table* (*open_table_v1_t)
   (struct PSI_table_share *share, const void *identity);
+typedef void (*unbind_table_v1_t)
+  (struct PSI_table *table);
+typedef void (*rebind_table_v1_t)
+  (struct PSI_table *table);
 typedef void (*close_table_v1_t)(struct PSI_table *table);
 typedef void (*create_file_v1_t)(PSI_file_key key, const char *name,
                                  File file);
@@ -399,6 +403,8 @@ struct PSI_v1
   release_table_share_v1_t release_table_share;
   drop_table_share_v1_t drop_table_share;
   open_table_v1_t open_table;
+  unbind_table_v1_t unbind_table;
+  rebind_table_v1_t rebind_table;
   close_table_v1_t close_table;
   create_file_v1_t create_file;
   spawn_thread_v1_t spawn_thread;

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result	2011-05-18 16:02:19 +0000
@@ -191,8 +191,8 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	25
@@ -236,8 +236,8 @@ TABLE	test	t3	31
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -321,8 +321,8 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -368,8 +368,8 @@ TABLE	test	t3	31
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
@@ -462,12 +462,12 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	77
@@ -511,12 +511,12 @@ TABLE	test	t3	82
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -614,12 +614,12 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -669,12 +669,12 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -721,12 +721,12 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	77
-wait/lock/table/sql/handler	56
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -774,12 +774,12 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	77
-wait/lock/table/sql/handler	56
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -827,8 +827,8 @@ execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -874,8 +874,8 @@ TABLE	test	t3	86
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result	2011-05-18 16:02:19 +0000
@@ -190,8 +190,8 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	37
@@ -237,8 +237,8 @@ TABLE	test	t3	31
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -324,8 +324,8 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -373,8 +373,8 @@ TABLE	test	t3	31
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
@@ -469,12 +469,12 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	113
@@ -520,12 +520,12 @@ TABLE	test	t3	82
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -625,12 +625,12 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -682,12 +682,12 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -736,12 +736,12 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	113
-wait/lock/table/sql/handler	84
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -791,12 +791,12 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	113
-wait/lock/table/sql/handler	84
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -846,8 +846,8 @@ execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -895,8 +895,8 @@ TABLE	test	t3	86
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result	2011-05-18 16:02:19 +0000
@@ -191,8 +191,8 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	25
@@ -236,8 +236,8 @@ TABLE	test	t3	31
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -321,10 +321,10 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	64
@@ -368,10 +368,10 @@ TABLE	test	t3	72
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -462,12 +462,12 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	116
@@ -511,12 +511,12 @@ TABLE	test	t3	123
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -614,14 +614,14 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181
@@ -669,14 +669,14 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	32
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181
@@ -721,14 +721,14 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	181
-wait/lock/table/sql/handler	104
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	32
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181
@@ -774,14 +774,14 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	181
-wait/lock/table/sql/handler	104
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	32
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181
@@ -825,12 +825,12 @@ TABLE	test	t3	188
 "================== Step 13 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181
@@ -874,10 +874,10 @@ TABLE	test	t3	188
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181
@@ -921,8 +921,8 @@ TABLE	test	t3	188
 "================== Step 15 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result	2011-05-18 16:02:19 +0000
@@ -190,8 +190,8 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	37
@@ -237,8 +237,8 @@ TABLE	test	t3	31
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -324,10 +324,10 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	94
@@ -373,10 +373,10 @@ TABLE	test	t3	72
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -469,12 +469,12 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	170
@@ -520,12 +520,12 @@ TABLE	test	t3	123
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -625,14 +625,14 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265
@@ -682,14 +682,14 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	48
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265
@@ -736,14 +736,14 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	265
-wait/lock/table/sql/handler	156
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	48
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265
@@ -791,14 +791,14 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	265
-wait/lock/table/sql/handler	156
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	48
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265
@@ -844,12 +844,12 @@ TABLE	test	t3	188
 "================== Step 13 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265
@@ -895,10 +895,10 @@ TABLE	test	t3	188
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265
@@ -944,8 +944,8 @@ TABLE	test	t3	188
 "================== Step 15 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result	2011-05-18 16:02:19 +0000
@@ -193,8 +193,8 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	25
@@ -234,8 +234,8 @@ TABLE	test	t3	31
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -315,8 +315,8 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -358,8 +358,8 @@ TABLE	test	t3	31
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
@@ -448,12 +448,12 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	77
@@ -493,12 +493,12 @@ TABLE	test	t3	82
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -592,12 +592,12 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -643,12 +643,12 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -691,12 +691,12 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	77
-wait/lock/table/sql/handler	56
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -740,12 +740,12 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	77
-wait/lock/table/sql/handler	56
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -789,8 +789,8 @@ execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -832,8 +832,8 @@ TABLE	test	t3	86
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result	2011-05-18 16:02:19 +0000
@@ -192,8 +192,8 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	37
@@ -233,8 +233,8 @@ TABLE	test	t3	31
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -314,8 +314,8 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -357,8 +357,8 @@ TABLE	test	t3	31
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
@@ -447,12 +447,12 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	113
@@ -492,12 +492,12 @@ TABLE	test	t3	82
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -591,12 +591,12 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -642,12 +642,12 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -690,12 +690,12 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	113
-wait/lock/table/sql/handler	84
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -739,12 +739,12 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	113
-wait/lock/table/sql/handler	84
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -788,8 +788,8 @@ execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -831,8 +831,8 @@ TABLE	test	t3	86
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result	2011-05-18 16:02:19 +0000
@@ -193,8 +193,8 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	25
@@ -234,8 +234,8 @@ TABLE	test	t3	31
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -315,10 +315,10 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	64
@@ -358,10 +358,10 @@ TABLE	test	t3	72
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -448,12 +448,12 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	116
@@ -493,12 +493,12 @@ TABLE	test	t3	123
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -592,14 +592,14 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181
@@ -643,14 +643,14 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	32
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181
@@ -691,14 +691,14 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	181
-wait/lock/table/sql/handler	104
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	32
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181
@@ -740,14 +740,14 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	181
-wait/lock/table/sql/handler	104
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	25
+wait/lock/table/sql/handler	32
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181
@@ -787,12 +787,12 @@ TABLE	test	t3	188
 "================== Step 13 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	39
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181
@@ -832,10 +832,10 @@ TABLE	test	t3	188
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	52
+wait/lock/table/sql/handler	24
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181
@@ -875,8 +875,8 @@ TABLE	test	t3	188
 "================== Step 15 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	65
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	181

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result	2011-05-18 16:02:19 +0000
@@ -192,8 +192,8 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	37
@@ -233,8 +233,8 @@ TABLE	test	t3	31
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -314,10 +314,10 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	94
@@ -357,10 +357,10 @@ TABLE	test	t3	72
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -447,12 +447,12 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	170
@@ -492,12 +492,12 @@ TABLE	test	t3	123
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -591,14 +591,14 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265
@@ -642,14 +642,14 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	48
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265
@@ -690,14 +690,14 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	265
-wait/lock/table/sql/handler	156
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	48
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265
@@ -739,14 +739,14 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	265
-wait/lock/table/sql/handler	156
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	37
+wait/lock/table/sql/handler	48
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265
@@ -786,12 +786,12 @@ TABLE	test	t3	188
 "================== Step 13 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	57
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265
@@ -831,10 +831,10 @@ TABLE	test	t3	188
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	76
+wait/lock/table/sql/handler	36
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265
@@ -874,8 +874,8 @@ TABLE	test	t3	188
 "================== Step 15 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/io/table/sql/handler	95
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	265

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result	2011-05-18 16:02:19 +0000
@@ -193,7 +193,7 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -236,7 +236,7 @@ TABLE	test	t3	17
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -319,7 +319,7 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -364,7 +364,7 @@ TABLE	test	t3	17
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -456,11 +456,11 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -503,11 +503,11 @@ TABLE	test	t3	54
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -604,11 +604,11 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -657,11 +657,11 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -707,11 +707,11 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -758,11 +758,11 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -809,7 +809,7 @@ execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -854,7 +854,7 @@ TABLE	test	t3	54
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result	2011-05-18 16:02:19 +0000
@@ -192,7 +192,7 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -236,7 +236,7 @@ TABLE	test	t3	17
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -320,7 +320,7 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -366,7 +366,7 @@ TABLE	test	t3	17
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -459,11 +459,11 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -507,11 +507,11 @@ TABLE	test	t3	54
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -609,11 +609,11 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -663,11 +663,11 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -714,11 +714,11 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -766,11 +766,11 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -818,7 +818,7 @@ execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -864,7 +864,7 @@ TABLE	test	t3	54
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result	2011-05-18 16:02:19 +0000
@@ -193,7 +193,7 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -236,7 +236,7 @@ TABLE	test	t3	17
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -319,9 +319,9 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -364,9 +364,9 @@ TABLE	test	t3	44
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -456,11 +456,11 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -503,11 +503,11 @@ TABLE	test	t3	81
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -604,13 +604,13 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -657,13 +657,13 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -707,13 +707,13 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -758,13 +758,13 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -807,11 +807,11 @@ TABLE	test	t3	128
 "================== Step 13 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -854,9 +854,9 @@ TABLE	test	t3	128
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -899,7 +899,7 @@ TABLE	test	t3	128
 "================== Step 15 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result	2011-05-18 16:02:19 +0000
@@ -192,7 +192,7 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -236,7 +236,7 @@ TABLE	test	t3	17
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -320,9 +320,9 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -366,9 +366,9 @@ TABLE	test	t3	44
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -459,11 +459,11 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -507,11 +507,11 @@ TABLE	test	t3	81
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -609,13 +609,13 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -663,13 +663,13 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -714,13 +714,13 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -766,13 +766,13 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -816,11 +816,11 @@ TABLE	test	t3	128
 "================== Step 13 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -864,9 +864,9 @@ TABLE	test	t3	128
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -910,7 +910,7 @@ TABLE	test	t3	128
 "================== Step 15 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result	2011-05-18 16:02:19 +0000
@@ -195,7 +195,7 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -236,7 +236,7 @@ TABLE	test	t3	17
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -317,7 +317,7 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -360,7 +360,7 @@ TABLE	test	t3	17
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -450,11 +450,11 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -495,11 +495,11 @@ TABLE	test	t3	54
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -594,11 +594,11 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -645,11 +645,11 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -693,11 +693,11 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -742,11 +742,11 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -791,7 +791,7 @@ execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -834,7 +834,7 @@ TABLE	test	t3	54
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result	2011-05-18 16:02:19 +0000
@@ -194,7 +194,7 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -235,7 +235,7 @@ TABLE	test	t3	17
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -316,7 +316,7 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -359,7 +359,7 @@ TABLE	test	t3	17
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -449,11 +449,11 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -494,11 +494,11 @@ TABLE	test	t3	54
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -593,11 +593,11 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -644,11 +644,11 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -692,11 +692,11 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -741,11 +741,11 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -790,7 +790,7 @@ execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -833,7 +833,7 @@ TABLE	test	t3	54
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result	2011-05-18 16:02:19 +0000
@@ -195,7 +195,7 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -236,7 +236,7 @@ TABLE	test	t3	17
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -317,9 +317,9 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -360,9 +360,9 @@ TABLE	test	t3	44
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -450,11 +450,11 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -495,11 +495,11 @@ TABLE	test	t3	81
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -594,13 +594,13 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -645,13 +645,13 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -693,13 +693,13 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -742,13 +742,13 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	25
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -789,11 +789,11 @@ TABLE	test	t3	128
 "================== Step 13 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	39
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -834,9 +834,9 @@ TABLE	test	t3	128
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	52
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -877,7 +877,7 @@ TABLE	test	t3	128
 "================== Step 15 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	65
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result	2011-05-18 16:02:19 +0000
@@ -194,7 +194,7 @@ a	b	c	d
 "================== Step 3 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -235,7 +235,7 @@ TABLE	test	t3	17
 "================== Step 4 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -316,9 +316,9 @@ a	b	c	d
 "================== Step 5 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -359,9 +359,9 @@ TABLE	test	t3	44
 "================== Step 6 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -449,11 +449,11 @@ a	b	c	d
 "================== Step 7 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -494,11 +494,11 @@ TABLE	test	t3	81
 "================== Step 8 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
@@ -593,13 +593,13 @@ a	b	c	d
 "================== Step 9 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -644,13 +644,13 @@ unlock tables;
 "================== Step 10 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -692,13 +692,13 @@ flush tables;
 "================== Step 11 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -741,13 +741,13 @@ set global read_only=0;
 "================== Step 12 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	37
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -788,11 +788,11 @@ TABLE	test	t3	128
 "================== Step 13 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	57
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -833,9 +833,9 @@ TABLE	test	t3	128
 "================== Step 14 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	76
 wait/lock/table/sql/handler	0
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star
@@ -876,7 +876,7 @@ TABLE	test	t3	128
 "================== Step 15 =================="
 execute dump_thread;
 event_name	count_star
-wait/io/table/sql/handler	0
+wait/io/table/sql/handler	95
 wait/lock/table/sql/handler	0
 execute dump_global;
 event_name	count_star

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result	2011-05-18 16:02:19 +0000
@@ -194,7 +194,7 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -237,7 +237,7 @@ TABLE	test	t3	14
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -320,7 +320,7 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -365,7 +365,7 @@ TABLE	test	t3	14
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
@@ -457,11 +457,11 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -504,11 +504,11 @@ TABLE	test	t3	28
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -605,11 +605,11 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -658,11 +658,11 @@ unlock tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -708,11 +708,11 @@ flush tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	56
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -759,11 +759,11 @@ set global read_only=0;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	56
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -810,7 +810,7 @@ event_name	count_star
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -855,7 +855,7 @@ TABLE	test	t3	32
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result	2011-05-18 16:02:19 +0000
@@ -193,7 +193,7 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -237,7 +237,7 @@ TABLE	test	t3	14
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -321,7 +321,7 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -367,7 +367,7 @@ TABLE	test	t3	14
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
@@ -460,11 +460,11 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -508,11 +508,11 @@ TABLE	test	t3	28
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -610,11 +610,11 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -664,11 +664,11 @@ unlock tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -715,11 +715,11 @@ flush tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	84
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -767,11 +767,11 @@ set global read_only=0;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	84
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -819,7 +819,7 @@ event_name	count_star
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -865,7 +865,7 @@ TABLE	test	t3	32
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result	2011-05-18 16:02:19 +0000
@@ -194,7 +194,7 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -237,7 +237,7 @@ TABLE	test	t3	14
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -320,9 +320,9 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -365,9 +365,9 @@ TABLE	test	t3	28
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -457,11 +457,11 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -504,11 +504,11 @@ TABLE	test	t3	42
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -605,13 +605,13 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -658,13 +658,13 @@ unlock tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -708,13 +708,13 @@ flush tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	104
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -759,13 +759,13 @@ set global read_only=0;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	104
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -808,11 +808,11 @@ TABLE	test	t3	60
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -855,9 +855,9 @@ TABLE	test	t3	60
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -900,7 +900,7 @@ TABLE	test	t3	60
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result	2011-05-18 16:02:19 +0000
@@ -193,7 +193,7 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -237,7 +237,7 @@ TABLE	test	t3	14
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -321,9 +321,9 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -367,9 +367,9 @@ TABLE	test	t3	28
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -460,11 +460,11 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -508,11 +508,11 @@ TABLE	test	t3	42
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -610,13 +610,13 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -664,13 +664,13 @@ unlock tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -715,13 +715,13 @@ flush tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	156
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -767,13 +767,13 @@ set global read_only=0;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	156
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -817,11 +817,11 @@ TABLE	test	t3	60
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -865,9 +865,9 @@ TABLE	test	t3	60
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -911,7 +911,7 @@ TABLE	test	t3	60
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result	2011-05-18 16:02:19 +0000
@@ -196,7 +196,7 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -237,7 +237,7 @@ TABLE	test	t3	14
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -318,7 +318,7 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -361,7 +361,7 @@ TABLE	test	t3	14
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
@@ -451,11 +451,11 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -496,11 +496,11 @@ TABLE	test	t3	28
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -595,11 +595,11 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -646,11 +646,11 @@ unlock tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -694,11 +694,11 @@ flush tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	56
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -743,11 +743,11 @@ set global read_only=0;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	56
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -792,7 +792,7 @@ event_name	count_star
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -835,7 +835,7 @@ TABLE	test	t3	32
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result	2011-05-18 16:02:19 +0000
@@ -195,7 +195,7 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -236,7 +236,7 @@ TABLE	test	t3	14
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -317,7 +317,7 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -360,7 +360,7 @@ TABLE	test	t3	14
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
@@ -450,11 +450,11 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -495,11 +495,11 @@ TABLE	test	t3	28
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -594,11 +594,11 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -645,11 +645,11 @@ unlock tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -693,11 +693,11 @@ flush tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	84
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -742,11 +742,11 @@ set global read_only=0;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	84
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -791,7 +791,7 @@ event_name	count_star
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -834,7 +834,7 @@ TABLE	test	t3	32
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result	2011-05-18 16:02:19 +0000
@@ -196,7 +196,7 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -237,7 +237,7 @@ TABLE	test	t3	14
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -318,9 +318,9 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -361,9 +361,9 @@ TABLE	test	t3	28
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -451,11 +451,11 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -496,11 +496,11 @@ TABLE	test	t3	42
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -595,13 +595,13 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -646,13 +646,13 @@ unlock tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -694,13 +694,13 @@ flush tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	104
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -743,13 +743,13 @@ set global read_only=0;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	104
+wait/lock/table/sql/handler	32
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -790,11 +790,11 @@ TABLE	test	t3	60
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -835,9 +835,9 @@ TABLE	test	t3	60
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -878,7 +878,7 @@ TABLE	test	t3	60
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	24
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result	2011-05-05 06:11:49 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result	2011-05-18 16:02:19 +0000
@@ -195,7 +195,7 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -236,7 +236,7 @@ TABLE	test	t3	14
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -317,9 +317,9 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -360,9 +360,9 @@ TABLE	test	t3	28
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -450,11 +450,11 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -495,11 +495,11 @@ TABLE	test	t3	42
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_global;
@@ -594,13 +594,13 @@ a	b	c	d
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -645,13 +645,13 @@ unlock tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -693,13 +693,13 @@ flush tables;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	156
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -742,13 +742,13 @@ set global read_only=0;
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	156
+wait/lock/table/sql/handler	48
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -789,11 +789,11 @@ TABLE	test	t3	60
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -834,9 +834,9 @@ TABLE	test	t3	60
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0
@@ -877,7 +877,7 @@ TABLE	test	t3	60
 execute dump_thread;
 event_name	count_star
 wait/io/table/sql/handler	0
-wait/lock/table/sql/handler	0
+wait/lock/table/sql/handler	36
 execute dump_global;
 event_name	count_star
 wait/io/table/sql/handler	0

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2011-05-10 13:37:37 +0000
+++ b/sql/sql_base.cc	2011-05-18 16:02:19 +0000
@@ -466,6 +466,15 @@ static void table_def_use_table(THD *thd
   DBUG_ASSERT(table->db_stat && table->file);
   /* The children must be detached from the table. */
   DBUG_ASSERT(! table->file->extra(HA_EXTRA_IS_ATTACHED_CHILDREN));
+
+#ifdef HAVE_PSI_INTERFACE
+  /*
+    Notify the instrumentation that this table is now owned
+    by this thread.
+  */
+  if (likely(PSI_server != NULL))
+    PSI_server->rebind_table(table->file->m_psi);
+#endif
 }
 
 
@@ -476,11 +485,22 @@ static void table_def_use_table(THD *thd
 static void table_def_unuse_table(TABLE *table)
 {
   DBUG_ASSERT(table->in_use);
+  DBUG_ASSERT(table->file);
 
   /* We shouldn't put the table to 'unused' list if the share is old. */
   DBUG_ASSERT(! table->s->has_old_version());
 
   table->in_use= 0;
+
+#ifdef HAVE_PSI_INTERFACE
+  /*
+    Notify the instrumentation that this table is not owned
+    by this thread any more.
+  */
+  if (likely(PSI_server != NULL))
+    PSI_server->unbind_table(table->file->m_psi);
+#endif
+
   /* Remove table from the list of tables used in this share. */
   table->s->used_tables.remove(table);
   /* Add table to the list of unused TABLE objects for this share. */

=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc	2011-05-13 13:44:31 +0000
+++ b/storage/perfschema/pfs.cc	2011-05-18 16:02:19 +0000
@@ -1452,17 +1452,37 @@ open_table_v1(PSI_table_share *share, co
   if (unlikely(thread == NULL))
     return NULL;
 
-  if (unlikely(setup_objects_version != pfs_table_share->m_setup_objects_version))
+  PFS_table *pfs_table= create_table(pfs_table_share, thread, identity);
+  return reinterpret_cast<PSI_table *> (pfs_table);
+}
+
+/**
+  Implementation of the table instrumentation interface.
+  @sa PSI_v1::unbind_table.
+*/
+static void unbind_table_v1(PSI_table *table)
+{
+  PFS_table *pfs= reinterpret_cast<PFS_table*> (table);
+  if (likely(pfs != NULL))
   {
-    pfs_table_share->refresh_setup_object_flags(thread);
+    pfs->aggregate();
+    pfs->m_thread_owner= NULL;
   }
+}
 
-  /* Do not instrument this table is all table instruments are disabled. */
-  if (! pfs_table_share->m_io_enabled && ! pfs_table_share->m_lock_enabled)
-    return NULL;
+/**
+  Implementation of the table instrumentation interface.
+  @sa PSI_v1::rebind_table.
+*/
+static void rebind_table_v1(PSI_table *table)
+{
+  PFS_table *pfs= reinterpret_cast<PFS_table*> (table);
+  if (likely(pfs != NULL))
+  {
+    DBUG_ASSERT(pfs->m_thread_owner == NULL);
 
-  PFS_table *pfs_table= create_table(pfs_table_share, thread, identity);
-  return reinterpret_cast<PSI_table *> (pfs_table);
+    pfs->m_thread_owner= my_pthread_getspecific_ptr(PFS_thread*, THR_PFS);
+  }
 }
 
 /**
@@ -2219,7 +2239,19 @@ get_thread_table_io_locker_v1(PSI_table_
   if (! flag_global_instrumentation)
     return NULL;
 
+  PFS_thread *pfs_thread= pfs_table->m_thread_owner;
+  if (unlikely(pfs_thread == NULL))
+    return NULL;
+
+  DBUG_ASSERT(pfs_thread ==
+              my_pthread_getspecific_ptr(PFS_thread*, THR_PFS));
+
   PFS_table_share *share= pfs_table->m_share;
+  if (unlikely(setup_objects_version != share->m_setup_objects_version))
+  {
+    share->refresh_setup_object_flags(pfs_thread);
+  }
+
   if (! share->m_io_enabled)
     return NULL;
 
@@ -2230,9 +2262,6 @@ get_thread_table_io_locker_v1(PSI_table_
 
   if (flag_thread_instrumentation)
   {
-    PFS_thread *pfs_thread= my_pthread_getspecific_ptr(PFS_thread*, THR_PFS);
-    if (unlikely(pfs_thread == NULL))
-      return NULL;
     if (! pfs_thread->m_enabled)
       return NULL;
     state->m_thread= reinterpret_cast<PSI_thread *> (pfs_thread);
@@ -2308,7 +2337,19 @@ get_thread_table_lock_locker_v1(PSI_tabl
   if (! flag_global_instrumentation)
     return NULL;
 
+  PFS_thread *pfs_thread= pfs_table->m_thread_owner;
+  if (unlikely(pfs_thread == NULL))
+    return NULL;
+
+  DBUG_ASSERT(pfs_thread ==
+              my_pthread_getspecific_ptr(PFS_thread*, THR_PFS));
+
   PFS_table_share *share= pfs_table->m_share;
+  if (unlikely(setup_objects_version != share->m_setup_objects_version))
+  {
+    share->refresh_setup_object_flags(pfs_thread);
+  }
+
   if (! share->m_lock_enabled)
     return NULL;
 
@@ -2341,9 +2382,6 @@ get_thread_table_lock_locker_v1(PSI_tabl
 
   if (flag_thread_instrumentation)
   {
-    PFS_thread *pfs_thread= my_pthread_getspecific_ptr(PFS_thread*, THR_PFS);
-    if (unlikely(pfs_thread == NULL))
-      return NULL;
     if (! pfs_thread->m_enabled)
       return NULL;
     state->m_thread= reinterpret_cast<PSI_thread *> (pfs_thread);
@@ -4212,6 +4250,8 @@ PSI_v1 PFS_v1=
   release_table_share_v1,
   drop_table_share_v1,
   open_table_v1,
+  unbind_table_v1,
+  rebind_table_v1,
   close_table_v1,
   create_file_v1,
   spawn_thread_v1,

No bundle (reason: useless for push emails).
Thread
• bzr push into mysql-trunk-wl5342 branch (marc.alff:3368 to 3369) Marc Alff19 May