List:Commits« Previous MessageNext Message »
From:Marc Alff Date:April 18 2011 11:41pm
Subject:bzr commit into mysql-trunk branch (marc.alff:3331) Bug#12370950
View as plain text  
#At file:///Users/malff/BZR_TREE/mysql-trunk-bug12370950/ based on revid:serge.kozlov@stripped

 3331 Marc Alff	2011-04-18
      Bug#12370950 TABLE_IO_WAITS_SUMMARY_BY_INDEX_USAGE AGGREGATES NON-INSERT DML WRONGLY
      
      Before this fix, table io for UPDATE and DELETE of a row was systematically counted,
      in table performance_schema.table_io_waits_summary_by_index_usage,
      as an operation using no index.
      
      With this fix, when an index was used to execute an UPDATE or DELETE statement,
      the table io for the UPDATE and DELETE are counted against the index used.

    modified:
      mysql-test/suite/perfschema/r/misc.result
      mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
      mysql-test/suite/perfschema/t/misc.test
      sql/handler.cc
=== modified file 'mysql-test/suite/perfschema/r/misc.result'
--- a/mysql-test/suite/perfschema/r/misc.result	2010-12-01 18:46:51 +0000
+++ b/mysql-test/suite/perfschema/r/misc.result	2011-04-18 23:41:45 +0000
@@ -27,3 +27,23 @@ where file_name like "%ghost%";
 FILE_NAME	EVENT_NAME	OPEN_COUNT
 select * from performance_schema.no_such_table;
 ERROR 42S02: Table 'performance_schema.no_such_table' doesn't exist
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (i INT, j INT, KEY(i)) ENGINE = InnoDB;
+INSERT INTO t1 VALUES
+(1,2), (3,4), (5,6), (7,8), (9,10);
+DELETE FROM t1 WHERE i = 1;
+DELETE FROM t1 WHERE j = 8;
+SELECT object_schema,
+object_name,
+index_name,
+count_fetch,
+count_insert,
+count_update,
+count_delete
+FROM performance_schema.table_io_waits_summary_by_index_usage
+WHERE object_schema = 'test'
+   AND object_name = 't1';
+object_schema	object_name	index_name	count_fetch	count_insert	count_update	count_delete
+test	t1	i	2	0	0	1
+test	t1	NULL	5	5	0	1
+DROP TABLE t1;

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result	2011-04-18 23:41:45 +0000
@@ -203,10 +203,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -246,10 +246,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -327,10 +327,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -372,10 +372,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -462,10 +462,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -509,10 +509,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -608,10 +608,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -659,10 +659,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -707,10 +707,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -756,10 +756,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -801,10 +801,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -844,10 +844,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -885,10 +885,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -924,10 +924,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -964,10 +964,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result	2011-04-18 23:41:45 +0000
@@ -202,10 +202,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -245,10 +245,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -326,10 +326,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -371,10 +371,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -461,10 +461,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -508,10 +508,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -607,10 +607,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -658,10 +658,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -706,10 +706,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -755,10 +755,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -800,10 +800,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -843,10 +843,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -884,10 +884,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -923,10 +923,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -963,10 +963,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result	2011-04-18 23:41:45 +0000
@@ -203,10 +203,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -246,10 +246,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -327,10 +327,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -372,10 +372,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -462,10 +462,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -509,10 +509,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -608,10 +608,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -659,10 +659,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -707,10 +707,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -756,10 +756,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -801,10 +801,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -844,10 +844,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -885,10 +885,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -924,10 +924,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -964,10 +964,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result	2011-04-18 23:41:45 +0000
@@ -202,10 +202,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -245,10 +245,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -326,10 +326,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -371,10 +371,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -461,10 +461,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -508,10 +508,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -607,10 +607,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -658,10 +658,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -706,10 +706,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -755,10 +755,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -800,10 +800,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -843,10 +843,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -884,10 +884,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -923,10 +923,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -963,10 +963,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== 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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result	2011-04-18 23:41:45 +0000
@@ -205,10 +205,10 @@ wait/io/table/sql/handler	17	TABLE	test	
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -252,10 +252,10 @@ wait/io/table/sql/handler	17	TABLE	test	
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -337,10 +337,10 @@ wait/io/table/sql/handler	17	TABLE	test	
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -386,10 +386,10 @@ wait/io/table/sql/handler	17	TABLE	test	
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -480,10 +480,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -531,10 +531,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -634,10 +634,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -689,10 +689,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -741,10 +741,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -794,10 +794,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -843,10 +843,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -890,10 +890,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -935,10 +935,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -978,10 +978,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1022,10 +1022,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== 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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result	2011-04-18 23:41:45 +0000
@@ -206,10 +206,10 @@ wait/io/table/sql/handler	17	TABLE	test	
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -255,10 +255,10 @@ wait/io/table/sql/handler	17	TABLE	test	
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -342,10 +342,10 @@ wait/io/table/sql/handler	17	TABLE	test	
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -393,10 +393,10 @@ wait/io/table/sql/handler	17	TABLE	test	
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -489,10 +489,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -542,10 +542,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -647,10 +647,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -704,10 +704,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -758,10 +758,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -813,10 +813,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -864,10 +864,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -913,10 +913,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -960,10 +960,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1005,10 +1005,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1051,10 +1051,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== 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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result	2011-04-18 23:41:45 +0000
@@ -205,10 +205,10 @@ wait/io/table/sql/handler	17	TABLE	test	
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -252,10 +252,10 @@ wait/io/table/sql/handler	17	TABLE	test	
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -337,10 +337,10 @@ wait/io/table/sql/handler	44	TABLE	test	
 wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -386,10 +386,10 @@ wait/io/table/sql/handler	44	TABLE	test	
 wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -480,10 +480,10 @@ wait/io/table/sql/handler	81	TABLE	test	
 wait/lock/table/sql/handler	42	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -531,10 +531,10 @@ wait/io/table/sql/handler	81	TABLE	test	
 wait/lock/table/sql/handler	42	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -634,10 +634,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	56	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -689,10 +689,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -741,10 +741,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -794,10 +794,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -843,10 +843,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -890,10 +890,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -935,10 +935,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -978,10 +978,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1022,10 +1022,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== 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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result	2011-04-18 23:41:45 +0000
@@ -206,10 +206,10 @@ wait/io/table/sql/handler	17	TABLE	test	
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -255,10 +255,10 @@ wait/io/table/sql/handler	17	TABLE	test	
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -342,10 +342,10 @@ wait/io/table/sql/handler	44	TABLE	test	
 wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -393,10 +393,10 @@ wait/io/table/sql/handler	44	TABLE	test	
 wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -489,10 +489,10 @@ wait/io/table/sql/handler	81	TABLE	test	
 wait/lock/table/sql/handler	42	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -542,10 +542,10 @@ wait/io/table/sql/handler	81	TABLE	test	
 wait/lock/table/sql/handler	42	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -647,10 +647,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	56	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -704,10 +704,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -758,10 +758,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -813,10 +813,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -864,10 +864,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -913,10 +913,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -960,10 +960,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1005,10 +1005,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1051,10 +1051,10 @@ wait/io/table/sql/handler	128	TABLE	test
 wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== 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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result	2011-04-18 23:41:45 +0000
@@ -203,10 +203,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -246,10 +246,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -327,10 +327,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -372,10 +372,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -462,10 +462,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -509,10 +509,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -608,10 +608,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -659,10 +659,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -707,10 +707,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -756,10 +756,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -801,10 +801,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -844,10 +844,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -885,10 +885,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -924,10 +924,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -964,10 +964,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== 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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result	2011-04-18 23:41:45 +0000
@@ -202,10 +202,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -245,10 +245,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -326,10 +326,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -371,10 +371,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -461,10 +461,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -508,10 +508,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -607,10 +607,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -658,10 +658,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -706,10 +706,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -755,10 +755,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -800,10 +800,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -843,10 +843,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -884,10 +884,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -923,10 +923,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -963,10 +963,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== 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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result	2011-04-18 23:41:45 +0000
@@ -203,10 +203,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -246,10 +246,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -327,10 +327,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -372,10 +372,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -462,10 +462,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -509,10 +509,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -608,10 +608,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -659,10 +659,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -707,10 +707,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -756,10 +756,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -801,10 +801,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -844,10 +844,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -885,10 +885,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -924,10 +924,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -964,10 +964,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== 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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result	2011-04-18 23:41:45 +0000
@@ -202,10 +202,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -245,10 +245,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -326,10 +326,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -371,10 +371,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -461,10 +461,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -508,10 +508,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -607,10 +607,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -658,10 +658,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -706,10 +706,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -755,10 +755,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -800,10 +800,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -843,10 +843,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -884,10 +884,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -923,10 +923,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -963,10 +963,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result	2011-04-18 23:41:45 +0000
@@ -205,10 +205,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -248,10 +248,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -329,10 +329,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -374,10 +374,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -464,10 +464,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -511,10 +511,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -610,10 +610,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -661,10 +661,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -709,10 +709,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -758,10 +758,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -803,10 +803,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -846,10 +846,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -887,10 +887,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -926,10 +926,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -966,10 +966,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result	2011-04-18 23:41:45 +0000
@@ -204,10 +204,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -247,10 +247,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -328,10 +328,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -373,10 +373,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -463,10 +463,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -510,10 +510,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -609,10 +609,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -660,10 +660,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -708,10 +708,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -757,10 +757,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -802,10 +802,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -845,10 +845,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -886,10 +886,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -925,10 +925,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -965,10 +965,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result	2011-04-18 23:41:45 +0000
@@ -205,10 +205,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -248,10 +248,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -329,10 +329,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -374,10 +374,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -464,10 +464,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -511,10 +511,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -610,10 +610,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -661,10 +661,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -709,10 +709,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -758,10 +758,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -803,10 +803,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -846,10 +846,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -887,10 +887,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -926,10 +926,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -966,10 +966,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== modified file 'mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result	2011-04-18 23:41:45 +0000
@@ -204,10 +204,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -247,10 +247,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -328,10 +328,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -373,10 +373,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -463,10 +463,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -510,10 +510,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -609,10 +609,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -660,10 +660,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -708,10 +708,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -757,10 +757,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -802,10 +802,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -845,10 +845,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -886,10 +886,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -925,10 +925,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -965,10 +965,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== 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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result	2011-04-18 23:41:45 +0000
@@ -205,10 +205,10 @@ wait/io/table/sql/handler	8	TABLE	test	t
 wait/io/table/sql/handler	17	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -250,10 +250,10 @@ wait/io/table/sql/handler	8	TABLE	test	t
 wait/io/table/sql/handler	17	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -333,10 +333,10 @@ wait/io/table/sql/handler	8	TABLE	test	t
 wait/io/table/sql/handler	17	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -380,10 +380,10 @@ wait/io/table/sql/handler	8	TABLE	test	t
 wait/io/table/sql/handler	17	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -472,10 +472,10 @@ wait/io/table/sql/handler	23	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -521,10 +521,10 @@ wait/io/table/sql/handler	23	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -622,10 +622,10 @@ wait/io/table/sql/handler	23	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -675,10 +675,10 @@ wait/io/table/sql/handler	23	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -725,10 +725,10 @@ wait/io/table/sql/handler	23	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -776,10 +776,10 @@ wait/io/table/sql/handler	23	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -823,10 +823,10 @@ wait/io/table/sql/handler	23	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -868,10 +868,10 @@ wait/io/table/sql/handler	23	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -911,10 +911,10 @@ wait/io/table/sql/handler	23	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -952,10 +952,10 @@ wait/io/table/sql/handler	23	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -994,10 +994,10 @@ wait/io/table/sql/handler	23	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result	2011-04-18 23:41:45 +0000
@@ -205,10 +205,10 @@ wait/io/table/sql/handler	12	TABLE	test	
 wait/io/table/sql/handler	17	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -251,10 +251,10 @@ wait/io/table/sql/handler	12	TABLE	test	
 wait/io/table/sql/handler	17	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -335,10 +335,10 @@ wait/io/table/sql/handler	12	TABLE	test	
 wait/io/table/sql/handler	17	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -383,10 +383,10 @@ wait/io/table/sql/handler	12	TABLE	test	
 wait/io/table/sql/handler	17	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -476,10 +476,10 @@ wait/io/table/sql/handler	36	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -526,10 +526,10 @@ wait/io/table/sql/handler	36	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -628,10 +628,10 @@ wait/io/table/sql/handler	36	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -682,10 +682,10 @@ wait/io/table/sql/handler	36	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -733,10 +733,10 @@ wait/io/table/sql/handler	36	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -785,10 +785,10 @@ wait/io/table/sql/handler	36	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -833,10 +833,10 @@ wait/io/table/sql/handler	36	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -879,10 +879,10 @@ wait/io/table/sql/handler	36	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -923,10 +923,10 @@ wait/io/table/sql/handler	36	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -965,10 +965,10 @@ wait/io/table/sql/handler	36	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1008,10 +1008,10 @@ wait/io/table/sql/handler	36	TABLE	test	
 wait/io/table/sql/handler	54	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result	2011-04-18 23:41:45 +0000
@@ -205,10 +205,10 @@ wait/io/table/sql/handler	8	TABLE	test	t
 wait/io/table/sql/handler	17	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -250,10 +250,10 @@ wait/io/table/sql/handler	8	TABLE	test	t
 wait/io/table/sql/handler	17	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -333,10 +333,10 @@ wait/io/table/sql/handler	20	TABLE	test	
 wait/io/table/sql/handler	44	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -380,10 +380,10 @@ wait/io/table/sql/handler	20	TABLE	test	
 wait/io/table/sql/handler	44	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -472,10 +472,10 @@ wait/io/table/sql/handler	35	TABLE	test	
 wait/io/table/sql/handler	81	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -521,10 +521,10 @@ wait/io/table/sql/handler	35	TABLE	test	
 wait/io/table/sql/handler	81	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -622,10 +622,10 @@ wait/io/table/sql/handler	53	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -675,10 +675,10 @@ wait/io/table/sql/handler	53	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -725,10 +725,10 @@ wait/io/table/sql/handler	53	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -776,10 +776,10 @@ wait/io/table/sql/handler	53	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -823,10 +823,10 @@ wait/io/table/sql/handler	53	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -868,10 +868,10 @@ wait/io/table/sql/handler	53	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -911,10 +911,10 @@ wait/io/table/sql/handler	53	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -952,10 +952,10 @@ wait/io/table/sql/handler	53	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -994,10 +994,10 @@ wait/io/table/sql/handler	53	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== 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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result	2011-04-18 23:41:45 +0000
@@ -205,10 +205,10 @@ wait/io/table/sql/handler	12	TABLE	test	
 wait/io/table/sql/handler	17	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -251,10 +251,10 @@ wait/io/table/sql/handler	12	TABLE	test	
 wait/io/table/sql/handler	17	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -335,10 +335,10 @@ wait/io/table/sql/handler	30	TABLE	test	
 wait/io/table/sql/handler	44	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -383,10 +383,10 @@ wait/io/table/sql/handler	30	TABLE	test	
 wait/io/table/sql/handler	44	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -476,10 +476,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/io/table/sql/handler	81	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -526,10 +526,10 @@ wait/io/table/sql/handler	54	TABLE	test	
 wait/io/table/sql/handler	81	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -628,10 +628,10 @@ wait/io/table/sql/handler	84	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -682,10 +682,10 @@ wait/io/table/sql/handler	84	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -733,10 +733,10 @@ wait/io/table/sql/handler	84	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -785,10 +785,10 @@ wait/io/table/sql/handler	84	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -833,10 +833,10 @@ wait/io/table/sql/handler	84	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -879,10 +879,10 @@ wait/io/table/sql/handler	84	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -923,10 +923,10 @@ wait/io/table/sql/handler	84	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -965,10 +965,10 @@ wait/io/table/sql/handler	84	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1008,10 +1008,10 @@ wait/io/table/sql/handler	84	TABLE	test	
 wait/io/table/sql/handler	128	TABLE	test	t3
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== 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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result	2011-04-18 23:41:45 +0000
@@ -205,10 +205,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -248,10 +248,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -329,10 +329,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -374,10 +374,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -464,10 +464,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -511,10 +511,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -610,10 +610,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -661,10 +661,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -709,10 +709,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -758,10 +758,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -803,10 +803,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -846,10 +846,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -887,10 +887,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -926,10 +926,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -966,10 +966,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result	2011-04-18 23:41:45 +0000
@@ -204,10 +204,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -247,10 +247,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -328,10 +328,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -373,10 +373,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -463,10 +463,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -510,10 +510,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -609,10 +609,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -660,10 +660,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -708,10 +708,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -757,10 +757,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -802,10 +802,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -845,10 +845,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -886,10 +886,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -925,10 +925,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -965,10 +965,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	20	12	8	12	2	6	0
+TABLE	test	t1	NULL	18	12	6	12	2	4	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	32	20	12	20	4	8	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result	2011-04-18 23:41:45 +0000
@@ -205,10 +205,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -248,10 +248,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -329,10 +329,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -374,10 +374,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -464,10 +464,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -511,10 +511,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -610,10 +610,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -661,10 +661,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -709,10 +709,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -758,10 +758,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -803,10 +803,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -846,10 +846,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -887,10 +887,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -926,10 +926,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -966,10 +966,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	0	0	0	0	0	0	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== 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-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result	2011-04-18 23:41:45 +0000
@@ -204,10 +204,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -247,10 +247,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	7	4	3	4	1	2	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t2	NULL	10	6	4	6	2	2	0
 TABLE	test	t2	index_b	1	1	0	1	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -328,10 +328,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -373,10 +373,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	10	7	10	2	5	0
+TABLE	test	t1	NULL	15	10	5	10	2	3	0
 TABLE	test	t1	index_b	1	1	0	1	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
 TABLE	test	t2	NULL	26	16	10	16	4	6	0
 TABLE	test	t2	index_b	2	2	0	2	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -463,10 +463,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -510,10 +510,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	30	18	12	18	3	9	0
+TABLE	test	t1	NULL	27	18	9	18	3	6	0
 TABLE	test	t1	index_b	2	2	0	2	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	48	30	18	30	6	12	0
 TABLE	test	t2	index_b	3	3	0	3	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -609,10 +609,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -660,10 +660,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -708,10 +708,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -757,10 +757,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -802,10 +802,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -845,10 +845,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -886,10 +886,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -925,10 +925,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -965,10 +965,10 @@ execute dump_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	46	28	18	28	4	14	0
+TABLE	test	t1	NULL	42	28	14	28	4	10	0
 TABLE	test	t1	index_b	3	3	0	3	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
 TABLE	test	t2	NULL	76	48	28	48	8	20	0
 TABLE	test	t2	index_b	4	4	0	4	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0

=== modified file 'mysql-test/suite/perfschema/t/misc.test'
--- a/mysql-test/suite/perfschema/t/misc.test	2010-12-01 18:46:51 +0000
+++ b/mysql-test/suite/perfschema/t/misc.test	2011-04-18 23:41:45 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -83,3 +83,34 @@ select * from performance_schema.file_in
 --error ER_NO_SUCH_TABLE
 select * from performance_schema.no_such_table;
 
+#
+# Bug#12370950 - 60905: TABLE_IO_WAITS_SUMMARY_BY_INDEX_USAGE AGGREGATES NON-INSERT DML WRONGLY
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+CREATE TABLE t1 (i INT, j INT, KEY(i)) ENGINE = InnoDB;
+INSERT INTO t1 VALUES
+(1,2), (3,4), (5,6), (7,8), (9,10);
+
+# should delete with a "single" PRIMARY lookup (2 PRIMARY fetch, 1 PRIMARY delete)
+DELETE FROM t1 WHERE i = 1;
+
+# should delete with a full scan (5 NULL fetch, 1 NULL delete)
+DELETE FROM t1 WHERE j = 8;
+
+# show the instrument data
+SELECT object_schema,
+       object_name,
+       index_name,
+       count_fetch,
+       count_insert,
+       count_update,
+       count_delete
+  FROM performance_schema.table_io_waits_summary_by_index_usage
+ WHERE object_schema = 'test'
+   AND object_name = 't1';
+
+DROP TABLE t1;
+

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2011-03-28 08:10:39 +0000
+++ b/sql/handler.cc	2011-04-18 23:41:45 +0000
@@ -5982,7 +5982,7 @@ int handler::ha_update_row(const uchar *
   mark_trx_read_write();
 
   MYSQL_START_TABLE_IO_WAIT(locker, &state, m_psi,
-                            PSI_TABLE_UPDATE_ROW, MAX_KEY, 0);
+                            PSI_TABLE_UPDATE_ROW, active_index, 0);
 
   error= update_row(old_data, new_data);
 
@@ -6007,7 +6007,7 @@ int handler::ha_delete_row(const uchar *
   mark_trx_read_write();
 
   MYSQL_START_TABLE_IO_WAIT(locker, &state, m_psi,
-                            PSI_TABLE_DELETE_ROW, MAX_KEY, 0);
+                            PSI_TABLE_DELETE_ROW, active_index, 0);
 
   error= delete_row(buf);
 


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20110418234145-zvklhp3jqo3js56d.bundle
Thread
bzr commit into mysql-trunk branch (marc.alff:3331) Bug#12370950Marc Alff19 Apr
  • Re: bzr commit into mysql-trunk branch (marc.alff:3331)Bug#12370950Bjorn Munch19 Apr