List:Commits« Previous MessageNext Message »
From:Marc Alff Date:April 19 2011 4:47pm
Subject:bzr commit into mysql-trunk branch (marc.alff:3326)
View as plain text  
#At file:///Users/malff/BZR_TREE/mysql-trunk-bug12338397/ based on revid:marc.alff@stripped

 3326 Marc Alff	2011-04-19 [merge]
      Local merge

    modified:
      mysql-test/collections/default.experimental
      mysql-test/lib/My/Find.pm
      mysql-test/lib/mtr_gcov.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/type_timestamp.result
      mysql-test/suite/binlog/r/binlog_bug23533.result
      mysql-test/suite/binlog/t/binlog_bug23533.test
      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
      mysql-test/t/type_timestamp.test
      sql/handler.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-04-13 21:03:10 +0000
+++ b/mysql-test/collections/default.experimental	2011-04-18 20:23:04 +0000
@@ -2,8 +2,7 @@
 # in alphabetical order. This also helps with merge conflict resolution.
 
 binlog.binlog_multi_engine               # joro : NDB tests marked as experimental as agreed with bochklin
-binlog.binlog_bug23533                   # WL#5867: skozlov: test case moved from unused bugs suite
-binlog.binlog_bug36391                   # WL#5867: skozlov: test case moved from unused bugs suite
+binlog.binlog_bug23533                   # skozlov: BUG#12371924
 
 funcs_1.charset_collation_1              # depends on compile-time decisions
 
@@ -19,12 +18,12 @@ main.subquery_sj_none @solaris          
 main.type_float @freebsd                 # Bug#38965 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
 main.wait_timeout @solaris               # Bug#51244 2010-04-26 alik wait_timeout fails on OpenSolaris
 
+rpl.rpl_checksum                         # BUG#12370830 2011-04-18 sven rpl_checksum failed on pb2 (server crash)
 rpl.rpl_innodb_bug28430                  # Bug#46029
 rpl.rpl_row_sp011  @solaris              # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 rpl.rpl_delayed_slave                    # BUG#57514 rpl_delayed_slave fails sporadically in pb
 rpl.rpl_seconds_behind_master            # BUG#58053 2010-11-24 luis fails sporadically on pb2
 rpl.rpl_show_slave_running               # BUG#12346048 2011-04-11 sven fails sporadically on pb2
-rpl.rpl_bug37426                         # WL#5867: skozlov: test case moved from unused bugs suite
 
 sys_vars.max_sp_recursion_depth_func @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 sys_vars.plugin_dir_basic                     # Bug#52223 2010-11-24 alik Test "plugin_dir_basic" does not support RPM build (test) directory structure

=== modified file 'mysql-test/lib/My/Find.pm'
--- a/mysql-test/lib/My/Find.pm	2011-02-24 14:11:05 +0000
+++ b/mysql-test/lib/My/Find.pm	2011-04-15 08:37:20 +0000
@@ -1,5 +1,5 @@
 # -*- cperl -*-
-# Copyright (C) 2008 MySQL AB
+# Copyright (c) 2004, 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
@@ -156,8 +156,7 @@ sub my_find_paths {
   # User can select to look in a special build dir
   # which is a subdirectory of any of the paths
   my @extra_dirs;
-  my $build_dir= $::opt_config_dir || $ENV{MTR_VS_CONFIG}
-                                   || $ENV{MTR_BUILD_DIR};
+  my $build_dir= $::opt_vs_config || $ENV{MTR_VS_CONFIG} || $ENV{MTR_BUILD_DIR};
   push(@extra_dirs, $build_dir) if defined $build_dir;
 
   if (defined $extension){

=== modified file 'mysql-test/lib/mtr_gcov.pl'
--- a/mysql-test/lib/mtr_gcov.pl	2011-01-18 11:01:40 +0000
+++ b/mysql-test/lib/mtr_gcov.pl	2011-04-14 12:25:15 +0000
@@ -1,5 +1,5 @@
 # -*- cperl -*-
-# Copyright (C) 2004, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
+# Copyright (c) 2004, 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
@@ -31,7 +31,7 @@ sub gcov_prepare ($) {
 #
 # Collect gcov statistics.
 # Arguments:
-#   $dir       basedir, normally source directory
+#   $dir       basedir, normally build directory
 #   $gcov      gcov utility program [path] name
 #   $gcov_msg  message file name
 #   $gcov_err  error file name
@@ -43,29 +43,25 @@ sub gcov_collect ($$$) {
   my $start_dir= cwd();
 
   print "Collecting source coverage info using '$gcov'...\n";
-  -f "$start_dir/$gcov_msg" and unlink("$start_dir/$gcov_msg");
-  -f "$start_dir/$gcov_err" and unlink("$start_dir/$gcov_err");
+  -f "$dir/$gcov_msg" and unlink("$dir/$gcov_msg");
+  -f "$dir/$gcov_err" and unlink("$dir/$gcov_err");
 
   my @dirs= `find "$dir" -type d -print | sort`;
   #print "List of directories:\n@dirs\n";
 
   foreach my $d ( @dirs ) {
-    my $dir_reported= 0;
     chomp($d);
     chdir($d) or next;
 
-    foreach my $f ( (glob("*.h"), glob("*.cc"), glob("*.c")) ) {
-      $f =~ /(.*)\.[ch]c?/;
-      -f "$1.gcno" or next;
-      if (!$dir_reported) {
-	print "Collecting in '$d'...\n";
-	$dir_reported= 1;
-      }
-      system("$gcov $f 2>>$start_dir/$gcov_err >>$start_dir/$gcov_msg");
+    my @flist= glob("*.*.gcno");
+    print ("Collecting in '$d'...\n") if @flist;
+
+    foreach my $f (@flist) {
+      system("$gcov $f 2>>$dir/$gcov_err >>$dir/$gcov_msg");
     }
     chdir($start_dir);
   }
-  print "gcov info in $gcov_msg, errors in $gcov_err\n";
+  print "gcov info in $dir/$gcov_msg, errors in $dir/$gcov_err\n";
 }
 
 

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-04-07 08:39:10 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-04-15 08:39:02 +0000
@@ -211,8 +211,8 @@ our $opt_clean_vardir= $ENV{'MTR_CLEAN_V
 
 our $opt_gcov;
 our $opt_gcov_exe= "gcov";
-our $opt_gcov_err= "mysql-test-gcov.msg";
-our $opt_gcov_msg= "mysql-test-gcov.err";
+our $opt_gcov_err= "mysql-test-gcov.err";
+our $opt_gcov_msg= "mysql-test-gcov.msg";
 
 our $opt_gprof;
 our %gprof_dirs;
@@ -508,7 +508,7 @@ sub main {
   mtr_print_line();
 
   if ( $opt_gcov ) {
-    gcov_collect($basedir, $opt_gcov_exe,
+    gcov_collect($bindir, $opt_gcov_exe,
 		 $opt_gcov_msg, $opt_gcov_err);
   }
 
@@ -1200,7 +1200,7 @@ sub command_line_setup {
 	chomp;
 	# remove comments (# foo) at the beginning of the line, or after a 
 	# blank at the end of the line
-	s/( +|^)#.*$//;
+	s/(\s+|^)#.*$//;
 	# If @ platform specifier given, use this entry only if it contains
 	# @<platform> or @!<xxx> where xxx != platform
 	if (/\@.*/)
@@ -1211,8 +1211,8 @@ sub command_line_setup {
 	  s/\@.*$//;
 	}
 	# remove whitespace
-	s/^ +//;              
-	s/ +$//;
+	s/^\s+//;
+	s/\s+$//;
 	# if nothing left, don't need to remember this line
 	if ( $_ eq "" ) {
 	  next;

=== modified file 'mysql-test/r/type_timestamp.result'
--- a/mysql-test/r/type_timestamp.result	2011-01-12 17:24:53 +0000
+++ b/mysql-test/r/type_timestamp.result	2011-04-18 08:47:41 +0000
@@ -523,6 +523,69 @@ a
 2000-01-01 00:00:01
 2000-01-01 00:00:01
 DROP TABLE t1;
+#
+# Bug#50774: failed to get the correct resultset when timestamp values 
+# are appended with .0
+#
+CREATE TABLE t1 ( a TIMESTAMP, KEY ( a ) );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:01' );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:02' );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:03' );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:04' );
+SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
+a
+2010-02-01 09:31:02
+2010-02-01 09:31:03
+2010-02-01 09:31:04
+SELECT * FROM t1 WHERE '2010-02-01 09:31:02.0' <= a;
+a
+2010-02-01 09:31:02
+2010-02-01 09:31:03
+2010-02-01 09:31:04
+SELECT * FROM t1 WHERE a <= '2010-02-01 09:31:02.0';
+a
+2010-02-01 09:31:01
+2010-02-01 09:31:02
+SELECT * FROM t1 WHERE '2010-02-01 09:31:02.0' >= a;
+a
+2010-02-01 09:31:01
+2010-02-01 09:31:02
+EXPLAIN
+SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+x	x	x	range	x	x	x	x	x	x
+SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
+a
+2010-02-01 09:31:02
+2010-02-01 09:31:03
+2010-02-01 09:31:04
+CREATE TABLE t2 ( a TIMESTAMP, KEY ( a DESC ) );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:01' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:02' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:03' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:04' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:05' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:06' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:07' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:08' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:09' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:10' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:11' );
+# The bug would cause the range optimizer's comparison to use an open
+# interval here. This reveals itself only in the number of reads 
+# performed.
+FLUSH STATUS;
+EXPLAIN
+SELECT * FROM t2 WHERE a < '2010-02-01 09:31:02.0';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+x	x	x	range	x	x	x	x	x	x
+SELECT * FROM t2 WHERE a < '2010-02-01 09:31:02.0';
+a
+2010-02-01 09:31:01
+SHOW STATUS LIKE 'Handler_read_next';
+Variable_name	Value
+Handler_read_next	1
+DROP TABLE t1, t2;
 End of 5.1 tests
 
 Bug#50888 valgrind warnings in Field_timestamp::val_str

=== modified file 'mysql-test/suite/binlog/r/binlog_bug23533.result'
--- a/mysql-test/suite/binlog/r/binlog_bug23533.result	2011-04-14 11:24:11 +0000
+++ b/mysql-test/suite/binlog/r/binlog_bug23533.result	2011-04-18 19:59:15 +0000
@@ -3,7 +3,9 @@ CREATE TABLE t1 (a INT NOT NULL AUTO_INC
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 1000
+SET @saved_binlog_cache_size=@@binlog_cache_size;
 SET @saved_max_binlog_cache_size=@@max_binlog_cache_size;
+SET GLOBAL binlog_cache_size=4096;
 SET GLOBAL max_binlog_cache_size=4096;
 START TRANSACTION;
 CREATE TABLE t2 SELECT * FROM t1;
@@ -13,4 +15,5 @@ SHOW TABLES LIKE 't%';
 Tables_in_test (t%)
 t1
 SET GLOBAL max_binlog_cache_size=@saved_max_binlog_cache_size;
+SET GLOBAL binlog_cache_size=@saved_binlog_cache_size;
 DROP TABLE t1;

=== modified file 'mysql-test/suite/binlog/t/binlog_bug23533.test'
--- a/mysql-test/suite/binlog/t/binlog_bug23533.test	2011-04-14 11:24:11 +0000
+++ b/mysql-test/suite/binlog/t/binlog_bug23533.test	2011-04-18 19:59:15 +0000
@@ -15,14 +15,18 @@ CREATE TABLE t1 (a INT NOT NULL AUTO_INC
 let $i= 1000;
 while ($i)
 {
+  BEGIN;
   eval INSERT INTO t1 VALUES($i, REPEAT('x', 4096));
+  COMMIT;
   dec $i;
 }
 --enable_query_log
 SELECT COUNT(*) FROM t1;
 
 # Set small value for max_binlog_cache_size
+SET @saved_binlog_cache_size=@@binlog_cache_size;
 SET @saved_max_binlog_cache_size=@@max_binlog_cache_size;
+SET GLOBAL binlog_cache_size=4096;
 SET GLOBAL max_binlog_cache_size=4096;
 
 # Copied data from t1 into t2 large than max_binlog_cache_size
@@ -34,4 +38,5 @@ SHOW TABLES LIKE 't%';
 
 # 5.1 End of Test
 SET GLOBAL max_binlog_cache_size=@saved_max_binlog_cache_size;
+SET GLOBAL binlog_cache_size=@saved_binlog_cache_size;
 DROP TABLE t1;

=== 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 'mysql-test/t/type_timestamp.test'
--- a/mysql-test/t/type_timestamp.test	2011-01-12 12:58:47 +0000
+++ b/mysql-test/t/type_timestamp.test	2011-04-18 08:46:17 +0000
@@ -362,6 +362,53 @@ SELECT a FROM t1 WHERE a >= '20000101000
 
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#50774: failed to get the correct resultset when timestamp values 
+--echo # are appended with .0
+--echo #
+CREATE TABLE t1 ( a TIMESTAMP, KEY ( a ) );
+
+INSERT INTO t1 VALUES( '2010-02-01 09:31:01' );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:02' );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:03' );
+INSERT INTO t1 VALUES( '2010-02-01 09:31:04' );
+
+SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
+SELECT * FROM t1 WHERE '2010-02-01 09:31:02.0' <= a;
+SELECT * FROM t1 WHERE a <= '2010-02-01 09:31:02.0';
+SELECT * FROM t1 WHERE '2010-02-01 09:31:02.0' >= a;
+
+--replace_column 1 x 2 x 3 x 5 x 6 x 7 x 8 x 9 x 10 x
+EXPLAIN
+SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
+SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
+
+CREATE TABLE t2 ( a TIMESTAMP, KEY ( a DESC ) );
+
+INSERT INTO t2 VALUES( '2010-02-01 09:31:01' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:02' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:03' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:04' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:05' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:06' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:07' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:08' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:09' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:10' );
+INSERT INTO t2 VALUES( '2010-02-01 09:31:11' );
+
+--echo # The bug would cause the range optimizer's comparison to use an open
+--echo # interval here. This reveals itself only in the number of reads 
+--echo # performed.
+FLUSH STATUS;
+--replace_column 1 x 2 x 3 x 5 x 6 x 7 x 8 x 9 x 10 x
+EXPLAIN
+SELECT * FROM t2 WHERE a < '2010-02-01 09:31:02.0';
+SELECT * FROM t2 WHERE a < '2010-02-01 09:31:02.0';
+SHOW STATUS LIKE 'Handler_read_next';
+
+DROP TABLE t1, t2;
+
 --echo End of 5.1 tests
 
 --echo

=== 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);
 

No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-trunk branch (marc.alff:3326) Marc Alff19 Apr