List:Commits« Previous MessageNext Message »
From:Marc Alff Date:May 5 2011 6:12am
Subject:bzr push into mysql-trunk-wl5342 branch (marc.alff:3366 to 3367) WL#5342
View as plain text  
 3367 Marc Alff	2011-05-05
      WL#5342 PERFORMANCE SCHEMA SETUP_OBJECTS, ENABLED column
      
      Added column ENABLED in table performance_schema.setup_objects.

    modified:
      mysql-test/suite/perfschema/r/dml_setup_objects.result
      mysql-test/suite/perfschema/r/information_schema.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
      mysql-test/suite/perfschema/r/privilege_table_io.result
      mysql-test/suite/perfschema/r/schema_lc0.result
      mysql-test/suite/perfschema/r/schema_lc1.result
      mysql-test/suite/perfschema/r/schema_lc2.result
      mysql-test/suite/perfschema/r/setup_objects.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
      mysql-test/suite/perfschema/t/privilege_table_io.test
      mysql-test/suite/perfschema/t/setup_objects.test
      scripts/mysql_system_tables.sql
      storage/perfschema/pfs_defaults.cc
      storage/perfschema/pfs_setup_object.cc
      storage/perfschema/table_setup_objects.cc
      storage/perfschema/table_setup_objects.h
 3366 Marc Alff	2011-05-04
      New tree

    modified:
      .bzr-mysql/default.conf
=== modified file 'mysql-test/suite/perfschema/r/dml_setup_objects.result'
--- a/mysql-test/suite/perfschema/r/dml_setup_objects.result	2010-11-15 15:04:34 +0000
+++ b/mysql-test/suite/perfschema/r/dml_setup_objects.result	2011-05-05 06:11:49 +0000
@@ -3,17 +3,17 @@ create table test.setup_objects as
 select * from performance_schema.setup_objects;
 truncate table performance_schema.setup_objects;
 select * from performance_schema.setup_objects;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
 select * from performance_schema.setup_objects
 where object_type = 'TABLE'
   order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
 insert into performance_schema.setup_objects
 set object_type='ILLEGAL', object_schema='FOO', object_name='BAR',
 timed='YES';
@@ -29,14 +29,14 @@ delete from performance_schema.setup_obj
 where object_type='TABLE' and object_schema='FOO';
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
 insert into performance_schema.setup_objects
 set object_type='TABLE', object_schema='FOO', object_name='BAR',
 timed='YES';
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	FOO	BAR	YES
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	FOO	BAR	YES	YES
 update performance_schema.setup_objects
 set object_type='ILLEGAL';
 ERROR HY000: Invalid performance_schema usage.
@@ -50,8 +50,8 @@ update performance_schema.setup_objects
 set timed='NO';
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	FOO	BAR	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	FOO	BAR	YES	NO
 update performance_schema.setup_objects
 set timed='YES';
 delete from performance_schema.setup_objects

=== 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-05 06:11:49 +0000
@@ -140,7 +140,7 @@ rwlock_instances	1000	0
 setup_actors	1	0
 setup_consumers	11	0
 setup_instruments	1000	0
-setup_objects	3	0
+setup_objects	4	0
 setup_timers	3	0
 table_io_waits_summary_by_index_usage	1000	0
 table_io_waits_summary_by_table	1000	0

=== 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-05 06:11:49 +0000
@@ -25,23 +25,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -71,23 +71,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -115,23 +115,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -159,23 +159,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -203,23 +203,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: 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/pfs_upgrade_lc1.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2011-02-25 16:41:57 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2011-05-05 06:11:49 +0000
@@ -25,23 +25,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -71,23 +71,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -115,23 +115,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -159,23 +159,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -203,23 +203,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: 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/pfs_upgrade_lc2.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result	2011-02-25 16:41:57 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result	2011-05-05 06:11:49 +0000
@@ -25,23 +25,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -71,23 +71,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -115,23 +115,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -159,23 +159,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -203,23 +203,23 @@ ERROR 1050 (42S01) at line 255: Table 'r
 ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists
 ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists
 ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 487: Table 'threads' already exists
-ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists
-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 292: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 300: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 345: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 389: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 468: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 488: Table 'threads' already exists
+ERROR 1050 (42S01) at line 503: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 518: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 533: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 546: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 558: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 601: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 644: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 687: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 719: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 750: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1644 (HY000) at line 1170: 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-05 06:11:49 +0000
@@ -9,6 +9,8 @@ flush status;
 # We are forced to suppress here the server response.
 optimize table mysql.db;
 update performance_schema.setup_consumers set enabled='YES';
+update performance_schema.setup_objects set enabled='YES'
+  where object_type='TABLE' and object_schema= 'mysql';
 flush privileges;
 insert into test.marker set a = 1;
 insert into test.marker set a = 1;
@@ -113,3 +115,5 @@ drop table test.marker;
 flush status;
 update performance_schema.setup_instruments set enabled='YES';
 update performance_schema.setup_consumers set enabled='YES';
+update performance_schema.setup_objects set enabled='NO'
+  where object_type='TABLE' and object_schema= 'mysql';

=== 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-05 06:11:49 +0000
@@ -473,6 +473,7 @@ setup_objects	CREATE TABLE `setup_object
   `OBJECT_TYPE` enum('TABLE') NOT NULL DEFAULT 'TABLE',
   `OBJECT_SCHEMA` varchar(64) DEFAULT '%',
   `OBJECT_NAME` varchar(64) NOT NULL DEFAULT '%',
+  `ENABLED` enum('YES','NO') NOT NULL DEFAULT 'YES',
   `TIMED` enum('YES','NO') NOT NULL DEFAULT 'YES'
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table setup_timers;

=== modified file 'mysql-test/suite/perfschema/r/schema_lc1.result'
--- a/mysql-test/suite/perfschema/r/schema_lc1.result	2011-02-15 17:14:15 +0000
+++ b/mysql-test/suite/perfschema/r/schema_lc1.result	2011-05-05 06:11:49 +0000
@@ -473,6 +473,7 @@ setup_objects	CREATE TABLE `setup_object
   `OBJECT_TYPE` enum('TABLE') NOT NULL DEFAULT 'TABLE',
   `OBJECT_SCHEMA` varchar(64) DEFAULT '%',
   `OBJECT_NAME` varchar(64) NOT NULL DEFAULT '%',
+  `ENABLED` enum('YES','NO') NOT NULL DEFAULT 'YES',
   `TIMED` enum('YES','NO') NOT NULL DEFAULT 'YES'
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table setup_timers;

=== modified file 'mysql-test/suite/perfschema/r/schema_lc2.result'
--- a/mysql-test/suite/perfschema/r/schema_lc2.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/schema_lc2.result	2011-05-05 06:11:49 +0000
@@ -473,6 +473,7 @@ setup_objects	CREATE TABLE `setup_object
   `OBJECT_TYPE` enum('TABLE') NOT NULL DEFAULT 'TABLE',
   `OBJECT_SCHEMA` varchar(64) DEFAULT '%',
   `OBJECT_NAME` varchar(64) NOT NULL DEFAULT '%',
+  `ENABLED` enum('YES','NO') NOT NULL DEFAULT 'YES',
   `TIMED` enum('YES','NO') NOT NULL DEFAULT 'YES'
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table setup_timers;

=== modified file 'mysql-test/suite/perfschema/r/setup_objects.result'
--- a/mysql-test/suite/perfschema/r/setup_objects.result	2010-11-15 15:04:34 +0000
+++ b/mysql-test/suite/perfschema/r/setup_objects.result	2011-05-05 06:11:49 +0000
@@ -2,29 +2,48 @@ drop table if exists test.setup_objects;
 create table test.setup_objects as select * from performance_schema.setup_objects;
 truncate table performance_schema.setup_objects;
 insert into performance_schema.setup_objects
-values ('TABLE', 'db1', 't1', 'YES');
+values ('TABLE', 'db1', 't1', 'YES', 'YES');
 insert into performance_schema.setup_objects
-values ('TABLE', 'db1', 't2', 'NO');
+values ('TABLE', 'db1', 't2', 'YES', 'NO');
 insert into performance_schema.setup_objects
-values ('TABLE', 'db1', '%', 'YES');
+values ('TABLE', 'db1', '%', 'YES', 'YES');
 insert into performance_schema.setup_objects
-values ('TABLE', 'db2', 't1', 'YES');
+values ('TABLE', 'db2', 't1', 'YES', 'YES');
 insert into performance_schema.setup_objects
-values ('TABLE', 'db2', 't2', 'NO');
+values ('TABLE', 'db2', 't2', 'YES', 'NO');
+insert into performance_schema.setup_objects
+values ('TABLE', 'db3', 't1', 'YES', 'YES');
+insert into performance_schema.setup_objects
+values ('TABLE', 'db3', 't2', 'NO', 'NO');
+insert into performance_schema.setup_objects
+values ('TABLE', 'db3', '%', 'NO', 'YES');
+insert into performance_schema.setup_objects
+values ('TABLE', 'db4', 't1', 'NO', 'YES');
+insert into performance_schema.setup_objects
+values ('TABLE', 'db4', '%', 'YES', 'NO');
 select * from performance_schema.setup_objects
 order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	db1	%	YES
-TABLE	db1	t1	YES
-TABLE	db1	t2	NO
-TABLE	db2	t1	YES
-TABLE	db2	t2	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	db1	%	YES	YES
+TABLE	db1	t1	YES	YES
+TABLE	db1	t2	YES	NO
+TABLE	db2	t1	YES	YES
+TABLE	db2	t2	YES	NO
+TABLE	db3	%	NO	YES
+TABLE	db3	t1	YES	YES
+TABLE	db3	t2	NO	NO
+TABLE	db4	%	YES	NO
+TABLE	db4	t1	NO	YES
 drop database if exists db1;
 drop database if exists db2;
 drop database if exists db3;
+drop database if exists db4;
+drop database if exists db5;
 create database db1;
 create database db2;
 create database db3;
+create database db4;
+create database db5;
 create table db1.t1(a int);
 create table db1.t2(a int);
 create table db1.t3(a int);
@@ -36,6 +55,16 @@ create table db2.t3(a int);
 create table db2.t4(a int);
 create table db2.t5(a int);
 create table db3.t1(a int);
+create table db3.t2(a int);
+create table db3.t3(a int);
+create table db3.t4(a int);
+create table db3.t5(a int);
+create table db4.t1(a int);
+create table db4.t2(a int);
+create table db4.t3(a int);
+create table db4.t4(a int);
+create table db4.t5(a int);
+create table db5.t1(a int);
 select * from db1.t1;
 a
 select * from db1.t2;
@@ -58,7 +87,27 @@ select * from db2.t5;
 a
 select * from db3.t1;
 a
-create table db3.t2(a int);
+select * from db3.t2;
+a
+select * from db3.t3;
+a
+select * from db3.t4;
+a
+select * from db3.t5;
+a
+select * from db4.t1;
+a
+select * from db4.t2;
+a
+select * from db4.t3;
+a
+select * from db4.t4;
+a
+select * from db4.t5;
+a
+select * from db5.t1;
+a
+create table db5.t2(a int);
 select * from db3.t2;
 a
 select distinct OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA 
@@ -69,11 +118,16 @@ order by OBJECT_TYPE, OBJECT_NAME, OBJEC
 OBJECT_TYPE	OBJECT_NAME	OBJECT_SCHEMA
 TABLE	t1	db1
 TABLE	t1	db2
+TABLE	t1	db3
 TABLE	t2	db1
 TABLE	t2	db2
+TABLE	t2	db4
 TABLE	t3	db1
+TABLE	t3	db4
 TABLE	t4	db1
+TABLE	t4	db4
 TABLE	t5	db1
+TABLE	t5	db4
 select distinct OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA 
 from performance_schema.events_waits_history_long
 where OBJECT_SCHEMA like "db%" and TIMER_END is not NULL
@@ -82,12 +136,13 @@ order by OBJECT_TYPE, OBJECT_NAME, OBJEC
 OBJECT_TYPE	OBJECT_NAME	OBJECT_SCHEMA
 TABLE	t1	db1
 TABLE	t1	db2
+TABLE	t1	db3
 TABLE	t3	db1
 TABLE	t4	db1
 TABLE	t5	db1
 update performance_schema.setup_objects
 set timed='YES' where OBJECT_SCHEMA = '%';
-create table db3.t3(a int);
+create table db5.t3(a int);
 select * from db3.t3;
 a
 truncate table performance_schema.setup_objects;
@@ -97,6 +152,8 @@ count(*)
 drop database db1;
 drop database db2;
 drop database db3;
+drop database db4;
+drop database db5;
 truncate table performance_schema.setup_objects;
 insert into performance_schema.setup_objects select * from test.setup_objects;
 drop table test.setup_objects;

=== 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-05 06:11:49 +0000
@@ -11,9 +11,9 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -9,10 +9,10 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -11,9 +11,9 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -9,10 +9,10 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -9,9 +9,9 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -7,10 +7,10 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -9,9 +9,9 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -7,10 +7,10 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -9,10 +9,10 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -11,9 +11,9 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	NO

=== 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-05 06:11:49 +0000
@@ -9,10 +9,10 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	NO

=== 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-05 06:11:49 +0000
@@ -11,9 +11,9 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	NO

=== 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-05 06:11:49 +0000
@@ -9,10 +9,10 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	NO

=== 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-05 06:11:49 +0000
@@ -13,9 +13,9 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -11,10 +11,10 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -13,9 +13,9 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -11,10 +11,10 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -11,9 +11,9 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -9,10 +9,10 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -11,9 +11,9 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -9,10 +9,10 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -13,9 +13,9 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	NO

=== 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-05 06:11:49 +0000
@@ -11,10 +11,10 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	NO

=== 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-05 06:11:49 +0000
@@ -13,9 +13,9 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	NO

=== 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-05 06:11:49 +0000
@@ -11,10 +11,10 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	NO

=== 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-05 06:11:49 +0000
@@ -13,9 +13,9 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -11,10 +11,10 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -13,9 +13,9 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -11,10 +11,10 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -11,9 +11,9 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -9,10 +9,10 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -11,9 +11,9 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -9,10 +9,10 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES

=== 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-05 06:11:49 +0000
@@ -13,9 +13,9 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	NO

=== 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-05 06:11:49 +0000
@@ -11,10 +11,10 @@ localhost	user1	%
 localhost	user3	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	NO

=== 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-05 06:11:49 +0000
@@ -13,9 +13,9 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	NO

=== 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-05 06:11:49 +0000
@@ -11,10 +11,10 @@ localhost	user3	%
 localhost	user4	%
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
-OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	TIMED
-TABLE	test	t1	YES
-TABLE	test	t2	NO
-TABLE	test	t3	NO
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	test	t1	YES	YES
+TABLE	test	t2	YES	NO
+TABLE	test	t3	YES	NO
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	NO

=== modified file 'mysql-test/suite/perfschema/t/privilege_table_io.test'
--- a/mysql-test/suite/perfschema/t/privilege_table_io.test	2010-11-09 08:16:50 +0000
+++ b/mysql-test/suite/perfschema/t/privilege_table_io.test	2011-05-05 06:11:49 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,6 +34,8 @@ optimize table mysql.db;
 
 # Start recording events
 update performance_schema.setup_consumers set enabled='YES';
+update performance_schema.setup_objects set enabled='YES'
+  where object_type='TABLE' and object_schema= 'mysql';
 
 # Code to test
 
@@ -52,3 +54,5 @@ let $schema_to_dump= "test", "mysql";
 # Cleanup
 --source ../include/table_io_cleanup_helper.inc
 
+update performance_schema.setup_objects set enabled='NO'
+  where object_type='TABLE' and object_schema= 'mysql';

=== modified file 'mysql-test/suite/perfschema/t/setup_objects.test'
--- a/mysql-test/suite/perfschema/t/setup_objects.test	2010-11-15 15:04:34 +0000
+++ b/mysql-test/suite/perfschema/t/setup_objects.test	2011-05-05 06:11:49 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,19 +25,34 @@ create table test.setup_objects as selec
 truncate table performance_schema.setup_objects;
 
 insert into performance_schema.setup_objects
-  values ('TABLE', 'db1', 't1', 'YES');
+  values ('TABLE', 'db1', 't1', 'YES', 'YES');
 
 insert into performance_schema.setup_objects
-  values ('TABLE', 'db1', 't2', 'NO');
+  values ('TABLE', 'db1', 't2', 'YES', 'NO');
 
 insert into performance_schema.setup_objects
-  values ('TABLE', 'db1', '%', 'YES');
+  values ('TABLE', 'db1', '%', 'YES', 'YES');
 
 insert into performance_schema.setup_objects
-  values ('TABLE', 'db2', 't1', 'YES');
+  values ('TABLE', 'db2', 't1', 'YES', 'YES');
 
 insert into performance_schema.setup_objects
-  values ('TABLE', 'db2', 't2', 'NO');
+  values ('TABLE', 'db2', 't2', 'YES', 'NO');
+
+insert into performance_schema.setup_objects
+  values ('TABLE', 'db3', 't1', 'YES', 'YES');
+
+insert into performance_schema.setup_objects
+  values ('TABLE', 'db3', 't2', 'NO', 'NO');
+
+insert into performance_schema.setup_objects
+  values ('TABLE', 'db3', '%', 'NO', 'YES');
+
+insert into performance_schema.setup_objects
+  values ('TABLE', 'db4', 't1', 'NO', 'YES');
+
+insert into performance_schema.setup_objects
+  values ('TABLE', 'db4', '%', 'YES', 'NO');
 
 select * from performance_schema.setup_objects
   order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
@@ -46,11 +61,15 @@ select * from performance_schema.setup_o
 drop database if exists db1;
 drop database if exists db2;
 drop database if exists db3;
+drop database if exists db4;
+drop database if exists db5;
 --enable_warnings
 
 create database db1;
 create database db2;
 create database db3;
+create database db4;
+create database db5;
 
 create table db1.t1(a int);
 create table db1.t2(a int);
@@ -65,6 +84,18 @@ create table db2.t4(a int);
 create table db2.t5(a int);
 
 create table db3.t1(a int);
+create table db3.t2(a int);
+create table db3.t3(a int);
+create table db3.t4(a int);
+create table db3.t5(a int);
+
+create table db4.t1(a int);
+create table db4.t2(a int);
+create table db4.t3(a int);
+create table db4.t4(a int);
+create table db4.t5(a int);
+
+create table db5.t1(a int);
 
 select * from db1.t1;
 select * from db1.t2;
@@ -79,8 +110,20 @@ select * from db2.t4;
 select * from db2.t5;
 
 select * from db3.t1;
+select * from db3.t2;
+select * from db3.t3;
+select * from db3.t4;
+select * from db3.t5;
 
-create table db3.t2(a int);
+select * from db4.t1;
+select * from db4.t2;
+select * from db4.t3;
+select * from db4.t4;
+select * from db4.t5;
+
+select * from db5.t1;
+
+create table db5.t2(a int);
 select * from db3.t2;
 
 # Verify what is instrumented
@@ -100,7 +143,7 @@ select distinct OBJECT_TYPE, OBJECT_NAME
 update performance_schema.setup_objects
   set timed='YES' where OBJECT_SCHEMA = '%';
 
-create table db3.t3(a int);
+create table db5.t3(a int);
 select * from db3.t3;
 
 truncate table performance_schema.setup_objects;
@@ -110,6 +153,8 @@ select count(*) from performance_schema.
 drop database db1;
 drop database db2;
 drop database db3;
+drop database db4;
+drop database db5;
 
 # Restore the setup
 truncate table performance_schema.setup_objects;

=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2011-03-18 22:51:17 +0000
+++ b/scripts/mysql_system_tables.sql	2011-05-05 06:11:49 +0000
@@ -498,6 +498,7 @@ SET @cmd="CREATE TABLE performance_schem
   "OBJECT_TYPE ENUM ('TABLE') not null default 'TABLE',"
   "OBJECT_SCHEMA VARCHAR(64) default '%',"
   "OBJECT_NAME VARCHAR(64) not null default '%',"
+  "ENABLED ENUM ('YES', 'NO') not null default 'YES',"
   "TIMED ENUM ('YES', 'NO') not null default 'YES'"
   ")ENGINE=PERFORMANCE_SCHEMA;";
 

=== modified file 'storage/perfschema/pfs_defaults.cc'
--- a/storage/perfschema/pfs_defaults.cc	2010-09-23 16:08:54 +0000
+++ b/storage/perfschema/pfs_defaults.cc	2011-05-05 06:11:49 +0000
@@ -45,22 +45,18 @@ void install_default_setup(PSI_bootstrap
   /* Enable all users on all hosts by default */
   insert_setup_actor(&percent, &percent, &percent);
 
-#if 0
   /* Disable system tables by default */
   String mysql_db("mysql", 5, &my_charset_utf8_bin);
   insert_setup_object(OBJECT_TYPE_TABLE, &mysql_db, &percent, false, false);
-#endif
+
   /* Disable performance/information schema tables. */
   String PS_db("performance_schema", 18, &my_charset_utf8_bin);
   String IS_db("information_schema", 18, &my_charset_utf8_bin);
   insert_setup_object(OBJECT_TYPE_TABLE, &PS_db, &percent, false, false);
   insert_setup_object(OBJECT_TYPE_TABLE, &IS_db, &percent, false, false);
+
   /* Enable every other tables */
   insert_setup_object(OBJECT_TYPE_TABLE, &percent, &percent, true, true);
-#if 0
-  /* Disable every temporary tables */
-  insert_setup_object(OBJECT_TYPE_TEMPORARY_TABLE, &percent, &percent, false, false);
-#endif
 
   psi->delete_current_thread();
 }

=== modified file 'storage/perfschema/pfs_setup_object.cc'
--- a/storage/perfschema/pfs_setup_object.cc	2010-09-24 21:04:59 +0000
+++ b/storage/perfschema/pfs_setup_object.cc	2011-05-05 06:11:49 +0000
@@ -251,7 +251,7 @@ int reset_setup_object()
 
   for ( ; pfs < pfs_last; pfs++)
   {
-    if (pfs->m_enabled && pfs->m_lock.is_populated())
+    if (pfs->m_lock.is_populated())
     {
       lf_hash_delete(&setup_object_hash, pins,
                      pfs->m_key.m_hash_key, pfs->m_key.m_key_length);

=== modified file 'storage/perfschema/table_setup_objects.cc'
--- a/storage/perfschema/table_setup_objects.cc	2010-12-02 16:38:55 +0000
+++ b/storage/perfschema/table_setup_objects.cc	2011-05-05 06:11:49 +0000
@@ -47,13 +47,11 @@ static const TABLE_FIELD_TYPE field_type
     { C_STRING_WITH_LEN("varchar(64)") },
     { NULL, 0}
   },
-#if 0
   {
     { C_STRING_WITH_LEN("ENABLED") },
     { C_STRING_WITH_LEN("enum(\'YES\',\'NO\')") },
     { NULL, 0}
   },
-#endif
   {
     { C_STRING_WITH_LEN("TIMED") },
     { C_STRING_WITH_LEN("enum(\'YES\',\'NO\')") },
@@ -63,7 +61,7 @@ static const TABLE_FIELD_TYPE field_type
 
 TABLE_FIELD_DEF
 table_setup_objects::m_field_def=
-{ 4, field_types };
+{ 5, field_types };
 
 PFS_engine_table_share
 table_setup_objects::m_share=
@@ -114,13 +112,11 @@ int table_setup_objects::write_row(TABLE
       case 2: /* OBJECT_NAME */
         object_name= get_field_varchar_utf8(f, &object_name_data);
         break;
-#if 0
       case 3: /* ENABLED */
         yes_no= (enum_yes_no) get_field_enum(f);
         enabled= (yes_no == ENUM_YES) ? true : false;
         break;
-#endif
-      case 3: /* TIMED */
+      case 4: /* TIMED */
         yes_no= (enum_yes_no) get_field_enum(f);
         timed= (yes_no == ENUM_YES) ? true : false;
         break;
@@ -209,17 +205,7 @@ void table_setup_objects::make_row(PFS_s
   m_row.m_schema_name_length= pfs->m_schema_name_length;
   memcpy(m_row.m_object_name, pfs->m_object_name, pfs->m_object_name_length);
   m_row.m_object_name_length= pfs->m_object_name_length;
-#if 0
   m_row.m_enabled_ptr= &pfs->m_enabled;
-#else
-  /*
-    The ENABLED column does not exist,
-    so disabled records are be displayed.
-  */
-  if (! pfs->m_enabled)
-    return;
-#endif
-
   m_row.m_timed_ptr= &pfs->m_timed;
 
   if (pfs->m_lock.end_optimistic_lock(&lock))
@@ -263,12 +249,10 @@ int table_setup_objects::read_row_values
         else
           f->set_null();
         break;
-#if 0
       case 3: /* ENABLED */
         set_field_enum(f, (*m_row.m_enabled_ptr) ? ENUM_YES : ENUM_NO);
         break;
-#endif
-      case 3: /* TIMED */
+      case 4: /* TIMED */
         set_field_enum(f, (*m_row.m_timed_ptr) ? ENUM_YES : ENUM_NO);
         break;
       default:
@@ -298,13 +282,11 @@ int table_setup_objects::update_row_valu
       case 1: /* OBJECT_SCHEMA */
       case 2: /* OBJECT_NAME */
         return HA_ERR_WRONG_COMMAND;
-#if 0
       case 3: /* ENABLED */
         value= (enum_yes_no) get_field_enum(f);
         *m_row.m_enabled_ptr= (value == ENUM_YES) ? true : false;
         break;
-#endif
-      case 3: /* TIMED */
+      case 4: /* TIMED */
         value= (enum_yes_no) get_field_enum(f);
         *m_row.m_timed_ptr= (value == ENUM_YES) ? true : false;
         break;

=== modified file 'storage/perfschema/table_setup_objects.h'
--- a/storage/perfschema/table_setup_objects.h	2010-09-23 16:08:54 +0000
+++ b/storage/perfschema/table_setup_objects.h	2011-05-05 06:11:49 +0000
@@ -44,10 +44,8 @@ struct row_setup_objects
   char m_object_name[NAME_LEN];
   /** Length in bytes of @c m_object_name. */
   uint m_object_name_length;
-#if 0
   /** Column ENABLED. */
   bool *m_enabled_ptr;
-#endif
   /** Column TIMED. */
   bool *m_timed_ptr;
 };

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5342 branch (marc.alff:3366 to 3367) WL#5342Marc Alff5 May