From: Mayank Prasad Date: December 20 2011 12:49pm Subject: bzr push into mysql-trunk-wl5767 branch (mayank.prasad:3404 to 3405) WL#5767 List-Archive: http://lists.mysql.com/commits/142212 Message-Id: <201112201249.pBKCn8wX029193@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3405 Mayank Prasad 2011-12-20 WL#5767 : Performance Schema, Satement Digest Details - Fixed failing test cases. modified: mysql-test/suite/perfschema/r/dml_setup_consumers.result mysql-test/suite/perfschema/r/setup_consumers_defaults.result mysql-test/suite/perfschema/r/start_server_disable_idle.result mysql-test/suite/perfschema/r/start_server_disable_stages.result mysql-test/suite/perfschema/r/start_server_disable_statements.result mysql-test/suite/perfschema/r/start_server_disable_waits.result mysql-test/suite/perfschema/r/start_server_nothing.result mysql-test/suite/perfschema/r/start_server_off.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 sql/sys_vars.cc 3404 Mayank Prasad 2011-12-20 WL#5767 : Performance Schema, Statement Digest Details - Added server startup option --performance_schema_consumer_statements_digest to enable/disable statements_digest consumer. Default value is set to FALSE. modified: sql/sys_vars.cc storage/perfschema/pfs_digest.cc storage/perfschema/pfs_server.cc storage/perfschema/pfs_server.h storage/perfschema/table_events_statements.cc 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-05-16 11:20:58 +0000 +++ b/mysql-test/suite/perfschema/r/dml_setup_consumers.result 2011-12-20 12:47:29 +0000 @@ -11,7 +11,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES select * from performance_schema.setup_consumers where name='events_waits_current'; NAME ENABLED @@ -30,7 +30,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES select * from performance_schema.setup_consumers where enabled='NO'; NAME ENABLED === modified file 'mysql-test/suite/perfschema/r/setup_consumers_defaults.result' --- a/mysql-test/suite/perfschema/r/setup_consumers_defaults.result 2011-11-25 11:03:13 +0000 +++ b/mysql-test/suite/perfschema/r/setup_consumers_defaults.result 2011-12-20 12:47:29 +0000 @@ -10,7 +10,7 @@ events_waits_current NO events_waits_history YES events_waits_history_long NO global_instrumentation YES -statement_digest YES +statements_digest YES thread_instrumentation YES SELECT @@performance_schema_consumer_events_stages_current; ERROR HY000: Unknown system variable 'performance_schema_consumer_events_stages_current' === modified file 'mysql-test/suite/perfschema/r/start_server_disable_idle.result' --- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result 2011-12-16 11:01:45 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result 2011-12-20 12:47:29 +0000 @@ -10,7 +10,7 @@ count(*) 5 select count(*) from performance_schema.setup_consumers; count(*) -11 +12 select count(*) > 3 from performance_schema.setup_instruments; count(*) > 3 1 @@ -69,6 +69,7 @@ show variables like "performance_schema% Variable_name Value performance_schema ON performance_schema_accounts_size 100 +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_disable_stages.result' --- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result 2011-12-16 11:01:45 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result 2011-12-20 12:47:29 +0000 @@ -10,7 +10,7 @@ count(*) 5 select count(*) from performance_schema.setup_consumers; count(*) -11 +12 select count(*) > 3 from performance_schema.setup_instruments; count(*) > 3 1 @@ -69,6 +69,7 @@ show variables like "performance_schema% Variable_name Value performance_schema ON performance_schema_accounts_size 100 +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_disable_statements.result' --- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result 2011-12-16 11:01:45 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result 2011-12-20 12:47:29 +0000 @@ -10,7 +10,7 @@ count(*) 5 select count(*) from performance_schema.setup_consumers; count(*) -11 +12 select count(*) > 3 from performance_schema.setup_instruments; count(*) > 3 1 @@ -69,6 +69,7 @@ show variables like "performance_schema% Variable_name Value performance_schema ON performance_schema_accounts_size 100 +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_disable_waits.result' --- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result 2011-12-16 11:01:45 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result 2011-12-20 12:47:29 +0000 @@ -10,7 +10,7 @@ count(*) 5 select count(*) from performance_schema.setup_consumers; count(*) -11 +12 select count(*) > 3 from performance_schema.setup_instruments; count(*) > 3 1 @@ -69,6 +69,7 @@ show variables like "performance_schema% Variable_name Value performance_schema ON performance_schema_accounts_size 100 +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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_nothing.result 2011-12-20 12:47:29 +0000 @@ -156,7 +156,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES select * from performance_schema.setup_timers; NAME TIMER_NAME idle MICROSECOND === modified file 'mysql-test/suite/perfschema/r/start_server_off.result' --- a/mysql-test/suite/perfschema/r/start_server_off.result 2011-11-25 11:03:13 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_off.result 2011-12-20 12:47:29 +0000 @@ -135,7 +135,7 @@ events_waits_history NO events_waits_history_long NO global_instrumentation NO thread_instrumentation NO -statement_digest YES +statements_digest YES select * from performance_schema.setup_instruments; NAME ENABLED TIMED select * from performance_schema.setup_actors; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result 2011-12-20 12:47:29 +0000 @@ -27,7 +27,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation NO -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result 2011-12-20 12:47:29 +0000 @@ -26,7 +26,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation NO -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result 2011-12-20 12:47:29 +0000 @@ -27,7 +27,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation NO -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result 2011-12-20 12:47:29 +0000 @@ -26,7 +26,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation NO -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result 2011-12-20 12:47:29 +0000 @@ -25,7 +25,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result 2011-12-20 12:47:29 +0000 @@ -24,7 +24,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result 2011-12-20 12:47:29 +0000 @@ -25,7 +25,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result 2011-12-20 12:47:29 +0000 @@ -24,7 +24,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === modified file 'mysql-test/suite/perfschema/r/table_aggregate_off.result' --- a/mysql-test/suite/perfschema/r/table_aggregate_off.result 2011-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result 2011-12-20 12:47:29 +0000 @@ -26,7 +26,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation NO thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result 2011-12-20 12:47:29 +0000 @@ -27,7 +27,7 @@ events_waits_history NO events_waits_history_long NO global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result 2011-12-20 12:47:29 +0000 @@ -26,7 +26,7 @@ events_waits_history NO events_waits_history_long NO global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result 2011-12-20 12:47:29 +0000 @@ -27,7 +27,7 @@ events_waits_history NO events_waits_history_long NO global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result 2011-12-20 12:47:29 +0000 @@ -26,7 +26,7 @@ events_waits_history NO events_waits_history_long NO global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result 2011-12-20 12:47:29 +0000 @@ -29,7 +29,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation NO -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result 2011-12-20 12:47:29 +0000 @@ -28,7 +28,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation NO -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result 2011-12-20 12:47:29 +0000 @@ -29,7 +29,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation NO -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result 2011-12-20 12:47:29 +0000 @@ -28,7 +28,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation NO -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result 2011-12-20 12:47:29 +0000 @@ -27,7 +27,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result 2011-12-20 12:47:29 +0000 @@ -26,7 +26,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result 2011-12-20 12:47:29 +0000 @@ -27,7 +27,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result 2011-12-20 12:47:29 +0000 @@ -26,7 +26,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result 2011-12-20 12:47:29 +0000 @@ -29,7 +29,7 @@ events_waits_history NO events_waits_history_long NO global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result 2011-12-20 12:47:29 +0000 @@ -28,7 +28,7 @@ events_waits_history NO events_waits_history_long NO global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result 2011-12-20 12:47:29 +0000 @@ -29,7 +29,7 @@ events_waits_history NO events_waits_history_long NO global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result 2011-12-20 12:47:29 +0000 @@ -28,7 +28,7 @@ events_waits_history NO events_waits_history_long NO global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result 2011-12-20 12:47:29 +0000 @@ -29,7 +29,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation NO -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result 2011-12-20 12:47:29 +0000 @@ -28,7 +28,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation NO -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result 2011-12-20 12:47:29 +0000 @@ -29,7 +29,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation NO -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result 2011-12-20 12:47:29 +0000 @@ -28,7 +28,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation NO -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result 2011-12-20 12:47:29 +0000 @@ -27,7 +27,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result 2011-12-20 12:47:29 +0000 @@ -26,7 +26,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result 2011-12-20 12:47:29 +0000 @@ -27,7 +27,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result 2011-12-20 12:47:29 +0000 @@ -26,7 +26,7 @@ events_waits_history YES events_waits_history_long YES global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result 2011-12-20 12:47:29 +0000 @@ -29,7 +29,7 @@ events_waits_history NO events_waits_history_long NO global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result 2011-12-20 12:47:29 +0000 @@ -28,7 +28,7 @@ events_waits_history NO events_waits_history_long NO global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result 2011-12-20 12:47:29 +0000 @@ -29,7 +29,7 @@ events_waits_history NO events_waits_history_long NO global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === 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-11-23 12:56:12 +0000 +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result 2011-12-20 12:47:29 +0000 @@ -28,7 +28,7 @@ events_waits_history NO events_waits_history_long NO global_instrumentation YES thread_instrumentation YES -statement_digest YES +statements_digest YES flush tables; truncate performance_schema.objects_summary_global_by_type; truncate performance_schema.table_io_waits_summary_by_index_usage; === modified file 'sql/sys_vars.cc' --- a/sql/sys_vars.cc 2011-12-19 19:08:09 +0000 +++ b/sql/sys_vars.cc 2011-12-20 12:47:29 +0000 @@ -248,7 +248,7 @@ static Sys_var_mybool Sys_pfs_consumer_s "performance_schema_consumer_statements_digest", "Default startup value for the statements_digest consumer.", READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_consumer_statement_digest_enabled), - CMD_LINE(OPT_ARG), DEFAULT(FALSE), + CMD_LINE(OPT_ARG), DEFAULT(TRUE), PFS_TRAILING_PROPERTIES); static Sys_var_ulong Sys_pfs_events_waits_history_long_size( No bundle (reason: useless for push emails).