List:Commits« Previous MessageNext Message »
From:Mayank Prasad Date:May 16 2011 11:21am
Subject:bzr commit into mysql-trunk-wl5767 branch (mayank.prasad:3368) WL#5767
View as plain text  
#At file:///home/mayank/mysql-tree/my_WL/5767/ based on revid:mayank.prasad@stripped

 3368 Mayank Prasad	2011-05-16
      WL#5767 : Commit with modified skeleton code and updated test cases.
      
      Covered:
      > Skeleton code updated as per small modification in LLD.
      > Test case failures.

    added:
      mysql-test/suite/perfschema/t/ddl_esms_by_digest.test
      mysql-test/suite/perfschema/t/dml_esms_by_digest.test
    modified:
      mysql-test/suite/perfschema/r/dml_setup_consumers.result
      mysql-test/suite/perfschema/r/information_schema.result
      mysql-test/suite/perfschema/r/ortho_iter.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
      mysql-test/suite/perfschema/r/privilege_table_io.result
      mysql-test/suite/perfschema/r/schema_lc0.result
      mysql-test/suite/perfschema/r/start_server_innodb.result
      mysql-test/suite/perfschema/r/start_server_no_cond_class.result
      mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
      mysql-test/suite/perfschema/r/start_server_no_file_class.result
      mysql-test/suite/perfschema/r/start_server_no_file_inst.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
      mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
      mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
      mysql-test/suite/perfschema/r/start_server_no_stage_class.result
      mysql-test/suite/perfschema/r/start_server_no_stages_history.result
      mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
      mysql-test/suite/perfschema/r/start_server_no_statement_class.result
      mysql-test/suite/perfschema/r/start_server_no_statements_history.result
      mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
      mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
      mysql-test/suite/perfschema/r/start_server_no_table_inst.result
      mysql-test/suite/perfschema/r/start_server_no_thread_class.result
      mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
      mysql-test/suite/perfschema/r/start_server_nothing.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_off.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
      mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
      scripts/mysql_system_tables.sql
      storage/perfschema/pfs_column_types.h
      storage/perfschema/pfs_digest.cc
      storage/perfschema/pfs_digest.h
      storage/perfschema/pfs_server.h
      storage/perfschema/table_esms_by_digest.cc
      storage/perfschema/table_esms_by_digest.h
      storage/perfschema/table_events_statements.cc
      storage/perfschema/table_events_statements.h
      storage/perfschema/table_setup_consumers.cc
=== modified file 'mysql-test/suite/perfschema/r/dml_setup_consumers.result'
--- a/mysql-test/suite/perfschema/r/dml_setup_consumers.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/dml_setup_consumers.result	2011-05-16 11:20:58 +0000
@@ -11,6 +11,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 select * from performance_schema.setup_consumers
 where name='events_waits_current';
 NAME	ENABLED
@@ -29,6 +30,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 select * from performance_schema.setup_consumers
 where enabled='NO';
 NAME	ENABLED

=== modified file 'mysql-test/suite/perfschema/r/information_schema.result'
--- a/mysql-test/suite/perfschema/r/information_schema.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/information_schema.result	2011-05-16 11:20:58 +0000
@@ -11,6 +11,7 @@ performance_schema	events_stages_summary
 performance_schema	events_statements_current	def
 performance_schema	events_statements_history	def
 performance_schema	events_statements_history_long	def
+performance_schema	events_statements_summary_by_digest	def
 performance_schema	events_statements_summary_by_thread_by_event_name	def
 performance_schema	events_statements_summary_global_by_event_name	def
 performance_schema	events_waits_current	def
@@ -48,6 +49,7 @@ events_stages_summary_global_by_event_na
 events_statements_current	BASE TABLE	PERFORMANCE_SCHEMA
 events_statements_history	BASE TABLE	PERFORMANCE_SCHEMA
 events_statements_history_long	BASE TABLE	PERFORMANCE_SCHEMA
+events_statements_summary_by_digest	BASE TABLE	PERFORMANCE_SCHEMA
 events_statements_summary_by_thread_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 events_statements_summary_global_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 events_waits_current	BASE TABLE	PERFORMANCE_SCHEMA
@@ -85,6 +87,7 @@ events_stages_summary_global_by_event_na
 events_statements_current	10	Dynamic
 events_statements_history	10	Dynamic
 events_statements_history_long	10	Dynamic
+events_statements_summary_by_digest	10	Dynamic
 events_statements_summary_by_thread_by_event_name	10	Dynamic
 events_statements_summary_global_by_event_name	10	Dynamic
 events_waits_current	10	Dynamic
@@ -122,6 +125,7 @@ events_stages_summary_global_by_event_na
 events_statements_current	1000	0
 events_statements_history	1000	0
 events_statements_history_long	10000	0
+events_statements_summary_by_digest	1000	0
 events_statements_summary_by_thread_by_event_name	1000	0
 events_statements_summary_global_by_event_name	1000	0
 events_waits_current	1000	0
@@ -138,7 +142,7 @@ objects_summary_global_by_type	1000	0
 performance_timers	5	0
 rwlock_instances	1000	0
 setup_actors	1	0
-setup_consumers	11	0
+setup_consumers	12	0
 setup_instruments	1000	0
 setup_objects	3	0
 setup_timers	3	0
@@ -159,6 +163,7 @@ events_stages_summary_global_by_event_na
 events_statements_current	0	0
 events_statements_history	0	0
 events_statements_history_long	0	0
+events_statements_summary_by_digest	0	0
 events_statements_summary_by_thread_by_event_name	0	0
 events_statements_summary_global_by_event_name	0	0
 events_waits_current	0	0
@@ -196,6 +201,7 @@ events_stages_summary_global_by_event_na
 events_statements_current	0	0	NULL
 events_statements_history	0	0	NULL
 events_statements_history_long	0	0	NULL
+events_statements_summary_by_digest	0	0	NULL
 events_statements_summary_by_thread_by_event_name	0	0	NULL
 events_statements_summary_global_by_event_name	0	0	NULL
 events_waits_current	0	0	NULL
@@ -233,6 +239,7 @@ events_stages_summary_global_by_event_na
 events_statements_current	NULL	NULL	NULL
 events_statements_history	NULL	NULL	NULL
 events_statements_history_long	NULL	NULL	NULL
+events_statements_summary_by_digest	NULL	NULL	NULL
 events_statements_summary_by_thread_by_event_name	NULL	NULL	NULL
 events_statements_summary_global_by_event_name	NULL	NULL	NULL
 events_waits_current	NULL	NULL	NULL
@@ -270,6 +277,7 @@ events_stages_summary_global_by_event_na
 events_statements_current	utf8_general_ci	NULL
 events_statements_history	utf8_general_ci	NULL
 events_statements_history_long	utf8_general_ci	NULL
+events_statements_summary_by_digest	utf8_general_ci	NULL
 events_statements_summary_by_thread_by_event_name	utf8_general_ci	NULL
 events_statements_summary_global_by_event_name	utf8_general_ci	NULL
 events_waits_current	utf8_general_ci	NULL
@@ -307,6 +315,7 @@ events_stages_summary_global_by_event_na
 events_statements_current	
 events_statements_history	
 events_statements_history_long	
+events_statements_summary_by_digest	
 events_statements_summary_by_thread_by_event_name	
 events_statements_summary_global_by_event_name	
 events_waits_current	

=== modified file 'mysql-test/suite/perfschema/r/ortho_iter.result'
--- a/mysql-test/suite/perfschema/r/ortho_iter.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/ortho_iter.result	2011-05-16 11:20:58 +0000
@@ -94,6 +94,7 @@ $
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result	2011-02-25 16:41:57 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result	2011-05-16 11:20:58 +0000
@@ -36,12 +36,13 @@ ERROR 1050 (42S01) at line 517: Table 'e
 ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists
 ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists
 ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 602: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 647: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 692: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 724: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 755: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 787: Table 'events_statements_summary_by_digest' already exists
+ERROR 1644 (HY000) at line 1207: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -82,12 +83,13 @@ ERROR 1050 (42S01) at line 517: Table 'e
 ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists
 ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists
 ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 602: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 647: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 692: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 724: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 755: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 787: Table 'events_statements_summary_by_digest' already exists
+ERROR 1644 (HY000) at line 1207: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -126,12 +128,13 @@ ERROR 1050 (42S01) at line 517: Table 'e
 ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists
 ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists
 ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 602: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 647: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 692: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 724: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 755: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 787: Table 'events_statements_summary_by_digest' already exists
+ERROR 1644 (HY000) at line 1207: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -170,12 +173,13 @@ ERROR 1050 (42S01) at line 517: Table 'e
 ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists
 ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists
 ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 602: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 647: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 692: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 724: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 755: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 787: Table 'events_statements_summary_by_digest' already exists
+ERROR 1644 (HY000) at line 1207: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -214,12 +218,13 @@ ERROR 1050 (42S01) at line 517: Table 'e
 ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists
 ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists
 ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 602: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 647: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 692: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 724: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 755: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 787: Table 'events_statements_summary_by_digest' already exists
+ERROR 1644 (HY000) at line 1207: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

=== modified file 'mysql-test/suite/perfschema/r/privilege_table_io.result'
--- a/mysql-test/suite/perfschema/r/privilege_table_io.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/privilege_table_io.result	2011-05-16 11:20:58 +0000
@@ -16,6 +16,7 @@ insert into test.marker set a = 1;
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/schema_lc0.result'
--- a/mysql-test/suite/perfschema/r/schema_lc0.result	2011-02-15 17:14:15 +0000
+++ b/mysql-test/suite/perfschema/r/schema_lc0.result	2011-05-16 11:20:58 +0000
@@ -16,6 +16,7 @@ events_stages_summary_global_by_event_na
 events_statements_current
 events_statements_history
 events_statements_history_long
+events_statements_summary_by_digest
 events_statements_summary_by_thread_by_event_name
 events_statements_summary_global_by_event_name
 events_waits_current
@@ -118,6 +119,8 @@ events_statements_current	CREATE TABLE `
   `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
   `LOCK_TIME` bigint(20) unsigned NOT NULL,
   `SQL_TEXT` longtext,
+  `DIGEST` varchar(64) DEFAULT NULL,
+  `DIGEST_TEXT` longtext,
   `CURRENT_SCHEMA` varchar(64) DEFAULT NULL,
   `OBJECT_TYPE` varchar(64) DEFAULT NULL,
   `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
@@ -159,6 +162,8 @@ events_statements_history	CREATE TABLE `
   `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
   `LOCK_TIME` bigint(20) unsigned NOT NULL,
   `SQL_TEXT` longtext,
+  `DIGEST` varchar(64) DEFAULT NULL,
+  `DIGEST_TEXT` longtext,
   `CURRENT_SCHEMA` varchar(64) DEFAULT NULL,
   `OBJECT_TYPE` varchar(64) DEFAULT NULL,
   `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
@@ -200,6 +205,8 @@ events_statements_history_long	CREATE TA
   `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
   `LOCK_TIME` bigint(20) unsigned NOT NULL,
   `SQL_TEXT` longtext,
+  `DIGEST` varchar(64) DEFAULT NULL,
+  `DIGEST_TEXT` longtext,
   `CURRENT_SCHEMA` varchar(64) DEFAULT NULL,
   `OBJECT_TYPE` varchar(64) DEFAULT NULL,
   `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,

=== modified file 'mysql-test/suite/perfschema/r/start_server_innodb.result'
--- a/mysql-test/suite/perfschema/r/start_server_innodb.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_innodb.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_cond_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_cond_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_file_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_file_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_mutex_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_setup_actors.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_setup_objects.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_stage_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_stages_history.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	0
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	0
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_statement_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_statements_history.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	0

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_table_hdl.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_table_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_thread_class.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_thread_inst.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_nothing.result'
--- a/mysql-test/suite/perfschema/r/start_server_nothing.result	2011-04-28 22:01:07 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_nothing.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 0
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	0
 performance_schema_events_stages_history_size	0
 performance_schema_events_statements_history_long_size	0
@@ -81,6 +82,7 @@ show status like "performance_schema%";
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	0
 performance_schema_events_stages_history_size	0
 performance_schema_events_statements_history_long_size	0
@@ -128,6 +130,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 select * from performance_schema.setup_timers;
 NAME	TIMER_NAME
 wait	CYCLE

=== modified file 'mysql-test/suite/perfschema/r/start_server_off.result'
--- a/mysql-test/suite/perfschema/r/start_server_off.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_off.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 0
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	OFF
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/start_server_on.result'
--- a/mysql-test/suite/perfschema/r/start_server_on.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_on.result	2011-05-16 11:20:58 +0000
@@ -10,7 +10,7 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-11
+12
 select count(*) > 2 from performance_schema.setup_instruments;
 count(*) > 2
 1
@@ -53,6 +53,7 @@ select * from performance_schema.threads
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result	2011-05-16 11:20:58 +0000
@@ -27,6 +27,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	NO
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -38,6 +39,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result	2011-05-16 11:20:58 +0000
@@ -26,6 +26,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	NO
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -37,6 +38,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result	2011-05-16 11:20:58 +0000
@@ -27,6 +27,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	NO
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -38,6 +39,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result	2011-05-16 11:20:58 +0000
@@ -26,6 +26,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	NO
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -37,6 +38,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result	2011-05-16 11:20:58 +0000
@@ -25,6 +25,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -36,6 +37,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result	2011-05-16 11:20:58 +0000
@@ -24,6 +24,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -35,6 +36,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result	2011-05-16 11:20:58 +0000
@@ -25,6 +25,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -36,6 +37,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result	2011-05-16 11:20:58 +0000
@@ -24,6 +24,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -35,6 +36,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/table_aggregate_off.result'
--- a/mysql-test/suite/perfschema/r/table_aggregate_off.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result	2011-05-16 11:20:58 +0000
@@ -26,6 +26,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	NO
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -37,6 +38,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result	2011-05-16 11:20:58 +0000
@@ -27,6 +27,7 @@ events_waits_history	NO
 events_waits_history_long	NO
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -38,6 +39,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result	2011-05-16 11:20:58 +0000
@@ -26,6 +26,7 @@ events_waits_history	NO
 events_waits_history_long	NO
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -37,6 +38,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result	2011-05-16 11:20:58 +0000
@@ -27,6 +27,7 @@ events_waits_history	NO
 events_waits_history_long	NO
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -38,6 +39,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result	2011-05-16 11:20:58 +0000
@@ -26,6 +26,7 @@ events_waits_history	NO
 events_waits_history_long	NO
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -37,6 +38,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result	2011-05-16 11:20:58 +0000
@@ -29,6 +29,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	NO
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -40,6 +41,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result	2011-05-16 11:20:58 +0000
@@ -28,6 +28,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	NO
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -39,6 +40,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result	2011-05-16 11:20:58 +0000
@@ -29,6 +29,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	NO
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -40,6 +41,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result	2011-05-16 11:20:58 +0000
@@ -28,6 +28,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	NO
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -39,6 +40,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result	2011-05-16 11:20:58 +0000
@@ -27,6 +27,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -38,6 +39,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result	2011-05-16 11:20:58 +0000
@@ -26,6 +26,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -37,6 +38,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result	2011-05-16 11:20:58 +0000
@@ -27,6 +27,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -38,6 +39,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result	2011-05-16 11:20:58 +0000
@@ -26,6 +26,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -37,6 +38,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result	2011-05-16 11:20:58 +0000
@@ -29,6 +29,7 @@ events_waits_history	NO
 events_waits_history_long	NO
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -40,6 +41,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result	2011-05-16 11:20:58 +0000
@@ -28,6 +28,7 @@ events_waits_history	NO
 events_waits_history_long	NO
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -39,6 +40,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result	2011-05-16 11:20:58 +0000
@@ -29,6 +29,7 @@ events_waits_history	NO
 events_waits_history_long	NO
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -40,6 +41,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== 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-04-18 23:41:45 +0000
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result	2011-05-16 11:20:58 +0000
@@ -28,6 +28,7 @@ events_waits_history	NO
 events_waits_history_long	NO
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -39,6 +40,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result	2011-05-16 11:20:58 +0000
@@ -29,6 +29,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	NO
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -40,6 +41,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result	2011-05-16 11:20:58 +0000
@@ -28,6 +28,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	NO
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -39,6 +40,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result	2011-05-16 11:20:58 +0000
@@ -29,6 +29,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	NO
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -40,6 +41,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result	2011-05-16 11:20:58 +0000
@@ -28,6 +28,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	NO
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -39,6 +40,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result	2011-05-16 11:20:58 +0000
@@ -27,6 +27,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -38,6 +39,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result	2011-05-16 11:20:58 +0000
@@ -26,6 +26,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -37,6 +38,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result	2011-05-16 11:20:58 +0000
@@ -27,6 +27,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -38,6 +39,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result	2011-05-16 11:20:58 +0000
@@ -26,6 +26,7 @@ events_waits_history	YES
 events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -37,6 +38,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result	2011-05-16 11:20:58 +0000
@@ -29,6 +29,7 @@ events_waits_history	NO
 events_waits_history_long	NO
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -40,6 +41,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result	2011-05-16 11:20:58 +0000
@@ -28,6 +28,7 @@ events_waits_history	NO
 events_waits_history_long	NO
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -39,6 +40,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result	2011-05-16 11:20:58 +0000
@@ -29,6 +29,7 @@ events_waits_history	NO
 events_waits_history_long	NO
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -40,6 +41,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== modified file 'mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result'
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result	2011-03-23 11:49:30 +0000
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result	2011-05-16 11:20:58 +0000
@@ -28,6 +28,7 @@ events_waits_history	NO
 events_waits_history_long	NO
 global_instrumentation	YES
 thread_instrumentation	YES
+statement_digest	YES
 flush tables;
 truncate performance_schema.objects_summary_global_by_type;
 truncate performance_schema.table_io_waits_summary_by_index_usage;
@@ -39,6 +40,7 @@ truncate performance_schema.events_waits
 show variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
+performance_schema_digests_size	200
 performance_schema_events_stages_history_long_size	1000
 performance_schema_events_stages_history_size	10
 performance_schema_events_statements_history_long_size	1000

=== added file 'mysql-test/suite/perfschema/t/ddl_esms_by_digest.test'
--- a/mysql-test/suite/perfschema/t/ddl_esms_by_digest.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/t/ddl_esms_by_digest.test	2011-05-16 11:20:58 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2008, 2010, 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
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
+
+# Tests for PERFORMANCE_SCHEMA
+
+#############################  TBD  #################################

=== added file 'mysql-test/suite/perfschema/t/dml_esms_by_digest.test'
--- a/mysql-test/suite/perfschema/t/dml_esms_by_digest.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/t/dml_esms_by_digest.test	2011-05-16 11:20:58 +0000
@@ -0,0 +1,18 @@
+# Copyright (c) 2009, 2010, 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
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
+
+# Tests for PERFORMANCE_SCHEMA
+
+##############################  TBD  #################################

=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2011-05-10 18:26:49 +0000
+++ b/scripts/mysql_system_tables.sql	2011-05-16 11:20:58 +0000
@@ -846,6 +846,8 @@ SET @cmd="CREATE TABLE performance_schem
   "TIMER_WAIT BIGINT unsigned,"
   "LOCK_TIME bigint unsigned not null,"
   "SQL_TEXT LONGTEXT,"
+  "DIGEST VARCHAR(64),"
+  "DIGEST_TEXT LONGTEXT,"
   "CURRENT_SCHEMA VARCHAR(64),"
   "OBJECT_TYPE VARCHAR(64),"
   "OBJECT_SCHEMA VARCHAR(64),"
@@ -873,8 +875,7 @@ SET @cmd="CREATE TABLE performance_schem
   "NO_INDEX_USED BIGINT unsigned not null,"
   "NO_GOOD_INDEX_USED BIGINT unsigned not null,"
   "NESTING_EVENT_ID BIGINT unsigned,"
-  "NESTING_EVENT_TYPE ENUM('STATEMENT', 'STAGE', 'WAIT'),"
-  "DIGEST VARCHAR(64) not null"
+  "NESTING_EVENT_TYPE ENUM('STATEMENT', 'STAGE', 'WAIT')"
   ")ENGINE=PERFORMANCE_SCHEMA;";
 
 SET @str = IF(@have_pfs = 1, @cmd, 'SET @dummy = 0');
@@ -896,6 +897,8 @@ SET @cmd="CREATE TABLE performance_schem
   "TIMER_WAIT BIGINT unsigned,"
   "LOCK_TIME bigint unsigned not null,"
   "SQL_TEXT LONGTEXT,"
+  "DIGEST VARCHAR(64),"
+  "DIGEST_TEXT LONGTEXT,"
   "CURRENT_SCHEMA VARCHAR(64),"
   "OBJECT_TYPE VARCHAR(64),"
   "OBJECT_SCHEMA VARCHAR(64),"
@@ -923,8 +926,7 @@ SET @cmd="CREATE TABLE performance_schem
   "NO_INDEX_USED BIGINT unsigned not null,"
   "NO_GOOD_INDEX_USED BIGINT unsigned not null,"
   "NESTING_EVENT_ID BIGINT unsigned,"
-  "NESTING_EVENT_TYPE ENUM('STATEMENT', 'STAGE', 'WAIT'),"
-  "DIGEST VARCHAR(64) not null"
+  "NESTING_EVENT_TYPE ENUM('STATEMENT', 'STAGE', 'WAIT')"
   ")ENGINE=PERFORMANCE_SCHEMA;";
 
 SET @str = IF(@have_pfs = 1, @cmd, 'SET @dummy = 0');
@@ -946,6 +948,8 @@ SET @cmd="CREATE TABLE performance_schem
   "TIMER_WAIT BIGINT unsigned,"
   "LOCK_TIME bigint unsigned not null,"
   "SQL_TEXT LONGTEXT,"
+  "DIGEST VARCHAR(64),"
+  "DIGEST_TEXT LONGTEXT,"
   "CURRENT_SCHEMA VARCHAR(64),"
   "OBJECT_TYPE VARCHAR(64),"
   "OBJECT_SCHEMA VARCHAR(64),"
@@ -973,8 +977,7 @@ SET @cmd="CREATE TABLE performance_schem
   "NO_INDEX_USED BIGINT unsigned not null,"
   "NO_GOOD_INDEX_USED BIGINT unsigned not null,"
   "NESTING_EVENT_ID BIGINT unsigned,"
-  "NESTING_EVENT_TYPE ENUM('STATEMENT', 'STAGE', 'WAIT'),"
-  "DIGEST VARCHAR(64) not null"
+  "NESTING_EVENT_TYPE ENUM('STATEMENT', 'STAGE', 'WAIT')"
   ")ENGINE=PERFORMANCE_SCHEMA;";
 
 SET @str = IF(@have_pfs = 1, @cmd, 'SET @dummy = 0');
@@ -1062,8 +1065,32 @@ DROP PREPARE stmt;
 --
 
 SET @cmd="CREATE TABLE performance_schema.events_statements_summary_by_digest("
-  "DIGEST VARCHAR(64) not null,"
-  "COUNT_STAR BIGINT unsigned not null"
+  "DIGEST VARCHAR(64),"
+  "DIGEST_TEXT LONGTEXT,"
+  "COUNT_STAR BIGINT unsigned not null,"
+  "SUM_TIMER_WAIT BIGINT unsigned not null,"
+  "MIN_TIMER_WAIT BIGINT unsigned not null,"
+  "AVG_TIMER_WAIT BIGINT unsigned not null,"
+  "MAX_TIMER_WAIT BIGINT unsigned not null,"
+  "SUM_LOCK_TIME BIGINT unsigned not null,"
+  "SUM_ERRORS BIGINT unsigned not null,"
+  "SUM_WARNINGS BIGINT unsigned not null,"
+  "SUM_ROWS_AFFECTED BIGINT unsigned not null,"
+  "SUM_ROWS_SENT BIGINT unsigned not null,"
+  "SUM_ROWS_EXAMINED BIGINT unsigned not null,"
+  "SUM_CREATED_TMP_DISK_TABLES BIGINT unsigned not null,"
+  "SUM_CREATED_TMP_TABLES BIGINT unsigned not null,"
+  "SUM_SELECT_FULL_JOIN BIGINT unsigned not null,"
+  "SUM_SELECT_FULL_RANGE_JOIN BIGINT unsigned not null,"
+  "SUM_SELECT_RANGE BIGINT unsigned not null,"
+  "SUM_SELECT_RANGE_CHECK BIGINT unsigned not null,"
+  "SUM_SELECT_SCAN BIGINT unsigned not null,"
+  "SUM_SORT_MERGE_PASSES BIGINT unsigned not null,"
+  "SUM_SORT_RANGE BIGINT unsigned not null,"
+  "SUM_SORT_ROWS BIGINT unsigned not null,"
+  "SUM_SORT_SCAN BIGINT unsigned not null,"
+  "SUM_NO_INDEX_USED BIGINT unsigned not null,"
+  "SUM_NO_GOOD_INDEX_USED BIGINT unsigned not null"
   ")ENGINE=PERFORMANCE_SCHEMA;";
 
 

=== modified file 'storage/perfschema/pfs_column_types.h'
--- a/storage/perfschema/pfs_column_types.h	2011-05-10 18:26:49 +0000
+++ b/storage/perfschema/pfs_column_types.h	2011-05-16 11:20:58 +0000
@@ -53,9 +53,12 @@
 /** Size of the SOURCE columns. */
 #define COL_SOURCE_SIZE 64
 
-/** Size of the Digest columns. */
+/** Size of the DIGEST columns. */
 #define COL_DIGEST_SIZE 64
 
+/** Size of the DIGEST_TEXT columns. */
+#define COL_DIGEST_TEXT_SIZE 1024
+
 /**
   Enum values for the TIMER_NAME columns.
   This enum is found in the following tables:

=== modified file 'storage/perfschema/pfs_digest.cc'
--- a/storage/perfschema/pfs_digest.cc	2011-05-10 18:26:49 +0000
+++ b/storage/perfschema/pfs_digest.cc	2011-05-16 11:20:58 +0000
@@ -19,10 +19,12 @@
 */
 
 #include "pfs_digest.h"
+#include "my_sys.h"
 
 /** EVENTS_STATEMENTS_HISTORY_LONG circular buffer. */
 PFS_statements_digest_stat *statements_digest_stat_array= NULL;
-
+/** Consumer flag for table EVENTS_STATEMENTS_SUMMARY_BY_DIGEST. */
+bool flag_statements_digest= true;
 
 /**
   Initialize table EVENTS_STATEMENTS_SUMMARY_BY_DIGEST.
@@ -30,9 +32,6 @@ PFS_statements_digest_stat *statements_d
 */
 int init_digest(unsigned int digest_sizing)
 {
-  printf("\n Initializing performance_schema_digests with\
-         digest_sizing=%d\n",digest_sizing);
-
   /* 
     TBD. Allocate memory for statements_digest_stat_array based on 
     performance_schema_digests_size values
@@ -43,7 +42,6 @@ int init_digest(unsigned int digest_sizi
 /** Cleanup table EVENTS_STATEMENTS_SUMMARY_BY_DIGEST. */
 int cleanup_digest(void)
 {
-  printf("\n Yes, cleaning up performance_schema_digests\n");
   /* 
     TBD. Free memory allocated to statements_digest_stat_array. 
   */

=== modified file 'storage/perfschema/pfs_digest.h'
--- a/storage/perfschema/pfs_digest.h	2011-05-10 18:26:49 +0000
+++ b/storage/perfschema/pfs_digest.h	2011-05-16 11:20:58 +0000
@@ -21,7 +21,7 @@
   Statement Digest data structures (declarations).
 */
 
-#include <stdio.h>
+extern bool flag_statements_digest;
 
 /** A statement stat record based on digest. */
 struct PFS_statements_digest_stat

=== modified file 'storage/perfschema/pfs_server.h'
--- a/storage/perfschema/pfs_server.h	2011-05-10 18:26:49 +0000
+++ b/storage/perfschema/pfs_server.h	2011-05-16 11:20:58 +0000
@@ -91,7 +91,7 @@
   #define PFS_STATEMENTS_STACK_SIZE 10
 #endif
 #ifndef PFS_DIGEST_SIZE
-  #define PFS_DIGEST_SIZE 100
+  #define PFS_DIGEST_SIZE 200
 #endif
 
 /** Performance schema global sizing parameters. */

=== modified file 'storage/perfschema/table_esms_by_digest.cc'
--- a/storage/perfschema/table_esms_by_digest.cc	2011-05-10 18:26:49 +0000
+++ b/storage/perfschema/table_esms_by_digest.cc	2011-05-16 11:20:58 +0000
@@ -40,16 +40,136 @@ static const TABLE_FIELD_TYPE field_type
     { C_STRING_WITH_LEN("varchar(64)") },
     { NULL, 0}
   },
+  {
+    { C_STRING_WITH_LEN("DIGEST_TEXT") },
+    { C_STRING_WITH_LEN("longtext") },
+    { NULL, 0}
+  },
   { 
     { C_STRING_WITH_LEN("COUNT_STAR") },
     { C_STRING_WITH_LEN("bigint(20)") },
     { NULL, 0}
   },
+  {
+    { C_STRING_WITH_LEN("SUM_TIMER_WAIT") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("MIN_TIMER_WAIT") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("AVG_TIMER_WAIT") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("MAX_TIMER_WAIT") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_LOCK_TIME") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_ERRORS") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_WARNINGS") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_ROWS_AFFECTED") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_ROWS_SENT") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_ROWS_EXAMINED") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_CREATED_TMP_DISK_TABLES") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_CREATED_TMP_TABLES") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_SELECT_FULL_JOIN") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_SELECT_FULL_RANGE_JOIN") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_SELECT_RANGE") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_SELECT_RANGE_CHECK") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_SELECT_SCAN") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_SORT_MERGE_PASSES") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_SORT_RANGE") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_SORT_ROWS") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_SORT_SCAN") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_NO_INDEX_USED") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("SUM_NO_GOOD_INDEX_USED") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  }
 };
 
 TABLE_FIELD_DEF
 table_esms_by_digest::m_field_def=
-{ 2, field_types };
+{ 26, field_types };
 
 PFS_engine_table_share
 table_esms_by_digest::m_share=

=== modified file 'storage/perfschema/table_esms_by_digest.h'
--- a/storage/perfschema/table_esms_by_digest.h	2011-05-10 18:26:49 +0000
+++ b/storage/perfschema/table_esms_by_digest.h	2011-05-16 11:20:58 +0000
@@ -39,6 +39,9 @@ struct row_esms_by_digest
   /** Column DIGEST. */
   char m_digest[COL_DIGEST_SIZE];
 
+  /** Column DIGEST_TEXT. */
+  char m_digest_text[COL_DIGEST_TEXT_SIZE];
+
   /** Columns COUNT_STAR, SUM/MIN/AVG/MAX TIMER_WAIT. */
   PFS_statement_stat_row m_stat;
 };

=== modified file 'storage/perfschema/table_events_statements.cc'
--- a/storage/perfschema/table_events_statements.cc	2011-05-10 18:26:49 +0000
+++ b/storage/perfschema/table_events_statements.cc	2011-05-16 11:20:58 +0000
@@ -78,6 +78,16 @@ static const TABLE_FIELD_TYPE field_type
     { NULL, 0}
   },
   {
+    { C_STRING_WITH_LEN("DIGEST") },
+    { C_STRING_WITH_LEN("varchar(64)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("DIGEST_TEXT") },
+    { C_STRING_WITH_LEN("longtext") },
+    { NULL, 0}
+  },
+  {
     { C_STRING_WITH_LEN("CURRENT_SCHEMA") },
     { C_STRING_WITH_LEN("varchar(64)") },
     { NULL, 0}
@@ -216,17 +226,12 @@ static const TABLE_FIELD_TYPE field_type
     { C_STRING_WITH_LEN("NESTING_EVENT_TYPE") },
     { C_STRING_WITH_LEN("enum(\'STATEMENT\',\'STAGE\',\'WAIT\'") },
     { NULL, 0}
-  },
-  {
-    { C_STRING_WITH_LEN("DIGEST") },
-    { C_STRING_WITH_LEN("varchar(64)") },
-    { NULL, 0}
   }
 };
 
 TABLE_FIELD_DEF
 table_events_statements_current::m_field_def=
-{38 , field_types };
+{39 , field_types };
 
 PFS_engine_table_share
 table_events_statements_current::m_share=
@@ -356,8 +361,7 @@ void table_events_statements_common::mak
   m_row.m_no_index_used= statement->m_no_index_used;
   m_row.m_no_good_index_used= statement->m_no_good_index_used;
 
-  /* TBD. Following */
-  strcpy(m_row.m_digest, "Mayank");
+  /* TBD for DIGEST and DIGEST_TEXT. */
 
   m_row_exists= true;
   return;
@@ -375,7 +379,7 @@ int table_events_statements_common::read
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 2);
+  DBUG_ASSERT(table->s->null_bytes == 3);
   buf[0]= 0;
   buf[1]= 0;
 
@@ -427,109 +431,114 @@ int table_events_statements_common::read
         else
           f->set_null();
         break;
-      case 9: /* CURRENT_SCHEMA */
+      case 9: /* DIGEST */
+        /* TBD */
+          f->set_null();
+        break;
+      case 10: /* DIGEST_TEXT */
+        /* TBD */
+          f->set_null();
+        break;
+      case 11: /* CURRENT_SCHEMA */
         if (m_row.m_current_schema_name_length)
           set_field_varchar_utf8(f, m_row.m_current_schema_name, m_row.m_current_schema_name_length);
         else
           f->set_null();
         break;
-      case 10: /* OBJECT_TYPE */
+      case 12: /* OBJECT_TYPE */
         f->set_null();
         break;
-      case 11: /* OBJECT_SCHEMA */
+      case 13: /* OBJECT_SCHEMA */
         f->set_null();
         break;
-      case 12: /* OBJECT_NAME */
+      case 14: /* OBJECT_NAME */
         f->set_null();
         break;
-      case 13: /* OBJECT_INSTANCE_BEGIN */
+      case 15: /* OBJECT_INSTANCE_BEGIN */
         f->set_null();
         break;
-      case 14: /* MYSQL_ERRNO */
+      case 16: /* MYSQL_ERRNO */
         set_field_ulong(f, m_row.m_sql_errno);
         break;
-      case 15: /* RETURNED_SQLSTATE */
+      case 17: /* RETURNED_SQLSTATE */
         if (m_row.m_sqlstate[0] != 0)
           set_field_varchar_utf8(f, m_row.m_sqlstate, SQLSTATE_LENGTH);
         else
           f->set_null();
         break;
-      case 16: /* MESSAGE_TEXT */
+      case 18: /* MESSAGE_TEXT */
         len= strlen(m_row.m_message_text);
         if (len)
           set_field_varchar_utf8(f, m_row.m_message_text, len);
         else
           f->set_null();
         break;
-      case 17: /* ERRORS */
+      case 19: /* ERRORS */
         set_field_ulonglong(f, m_row.m_error_count);
         break;
-      case 18: /* WARNINGS */
+      case 20: /* WARNINGS */
         set_field_ulonglong(f, m_row.m_warning_count);
         break;
-      case 19: /* ROWS_AFFECTED */
+      case 21: /* ROWS_AFFECTED */
         set_field_ulonglong(f, m_row.m_rows_affected);
         break;
-      case 20: /* ROWS_SENT */
+      case 22: /* ROWS_SENT */
         set_field_ulonglong(f, m_row.m_rows_sent);
         break;
-      case 21: /* ROWS_EXAMINED */
+      case 23: /* ROWS_EXAMINED */
         set_field_ulonglong(f, m_row.m_rows_examined);
         break;
-      case 22: /* CREATED_TMP_DISK_TABLES */
+      case 24: /* CREATED_TMP_DISK_TABLES */
         set_field_ulonglong(f, m_row.m_created_tmp_disk_tables);
         break;
-      case 23: /* CREATED_TMP_TABLES */
+      case 25: /* CREATED_TMP_TABLES */
         set_field_ulonglong(f, m_row.m_created_tmp_tables);
         break;
-      case 24: /* SELECT_FULL_JOIN */
+      case 26: /* SELECT_FULL_JOIN */
         set_field_ulonglong(f, m_row.m_select_full_join);
         break;
-      case 25: /* SELECT_FULL_RANGE_JOIN */
+      case 27: /* SELECT_FULL_RANGE_JOIN */
         set_field_ulonglong(f, m_row.m_select_full_range_join);
         break;
-      case 26: /* SELECT_RANGE */
+      case 28: /* SELECT_RANGE */
         set_field_ulonglong(f, m_row.m_select_range);
         break;
-      case 27: /* SELECT_RANGE_CHECK */
+      case 29: /* SELECT_RANGE_CHECK */
         set_field_ulonglong(f, m_row.m_select_range_check);
         break;
-      case 28: /* SELECT_SCAN */
+      case 30: /* SELECT_SCAN */
         set_field_ulonglong(f, m_row.m_select_scan);
         break;
-      case 29: /* SORT_MERGE_PASSES */
+      case 31: /* SORT_MERGE_PASSES */
         set_field_ulonglong(f, m_row.m_sort_merge_passes);
         break;
-      case 30: /* SORT_RANGE */
+      case 32: /* SORT_RANGE */
         set_field_ulonglong(f, m_row.m_sort_range);
         break;
-      case 31: /* SORT_ROWS */
+      case 33: /* SORT_ROWS */
         set_field_ulonglong(f, m_row.m_sort_rows);
         break;
-      case 32: /* SORT_SCAN */
+      case 34: /* SORT_SCAN */
         set_field_ulonglong(f, m_row.m_sort_scan);
         break;
-      case 33: /* NO_INDEX_USED */
+      case 35: /* NO_INDEX_USED */
         set_field_ulonglong(f, m_row.m_no_index_used);
         break;
-      case 34: /* NO_GOOD_INDEX_USED */
+      case 36: /* NO_GOOD_INDEX_USED */
         set_field_ulonglong(f, m_row.m_no_good_index_used);
         break;
-      case 35: /* NESTING_EVENT_ID */
+      case 37: /* NESTING_EVENT_ID */
         if (m_row.m_nesting_event_id != 0)
           set_field_ulonglong(f, m_row.m_nesting_event_id);
         else
           f->set_null();
         break;
-      case 36: /* NESTING_EVENT_TYPE */
+      case 38: /* NESTING_EVENT_TYPE */
         if (m_row.m_nesting_event_id != 0)
           set_field_enum(f, m_row.m_nesting_event_type);
         else
           f->set_null();
         break;
-      case 37: /* DIGEST */
-        /* TBD */
-        break;
       default:
         DBUG_ASSERT(false);
       }

=== modified file 'storage/perfschema/table_events_statements.h'
--- a/storage/perfschema/table_events_statements.h	2011-05-10 18:26:49 +0000
+++ b/storage/perfschema/table_events_statements.h	2011-05-16 11:20:58 +0000
@@ -61,6 +61,10 @@ struct row_events_statements
   uint m_source_length;
   /** Column SQL_TEXT. */
   char m_sqltext[COL_INFO_SIZE];
+  /** Column DIGEST. */
+  char m_digest[COL_DIGEST_SIZE];
+  /** Column DIGEST_TEXT. */
+  char m_digest_text[COL_DIGEST_TEXT_SIZE];
   /** Length in bytes of @c m_info. */
   uint m_sqltext_length;
   /** Column CURRENT_SCHEMA. */
@@ -110,8 +114,6 @@ struct row_events_statements
   ulonglong m_no_index_used;
   /** Column NO_GOOD_INDEX_USED. */
   ulonglong m_no_good_index_used;
-  /** Column DIGEST. */
-  char m_digest[COL_DIGEST_SIZE];
 };
 
 /** Position of a cursor on PERFORMANCE_SCHEMA.EVENTS_STATEMENTS_CURRENT. */

=== modified file 'storage/perfschema/table_setup_consumers.cc'
--- a/storage/perfschema/table_setup_consumers.cc	2011-02-14 14:23:55 +0000
+++ b/storage/perfschema/table_setup_consumers.cc	2011-05-16 11:20:58 +0000
@@ -23,8 +23,9 @@
 #include "table_setup_consumers.h"
 #include "pfs_instr.h"
 #include "pfs_events_waits.h"
+#include "pfs_digest.h"
 
-#define COUNT_SETUP_CONSUMERS 11
+#define COUNT_SETUP_CONSUMERS 12
 static row_setup_consumers all_setup_consumers_data[COUNT_SETUP_CONSUMERS]=
 {
   {
@@ -70,6 +71,10 @@ static row_setup_consumers all_setup_con
   {
     { C_STRING_WITH_LEN("thread_instrumentation") },
     &flag_thread_instrumentation
+  },
+  {
+    { C_STRING_WITH_LEN("statement_digest") },
+    &flag_statements_digest
   }
 };
 


Attachment: [text/bzr-bundle] bzr/mayank.prasad@oracle.com-20110516112058-hux1iev0a9u7kljy.bundle
Thread
bzr commit into mysql-trunk-wl5767 branch (mayank.prasad:3368) WL#5767Mayank Prasad16 May