List:Commits« Previous MessageNext Message »
From:Marc Alff Date:September 24 2010 8:22pm
Subject:bzr commit into mysql-next-mr-wl4816 branch (marc.alff:3198)
View as plain text  
#At file:///Users/malff/BZR_TREE/mysql-next-mr-wl4816/ based on revid:marc.alff@stripped

 3198 Marc Alff	2010-09-24
      Test cleanup

    removed:
      mysql-test/suite/perfschema/r/schema.result
    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
      mysql-test/suite/perfschema/r/schema_lc1.result
      mysql-test/suite/perfschema/r/schema_lc2.result
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2010-09-02 00:00:20 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2010-09-24 20:22:04 +0000
@@ -19,14 +19,16 @@ ERROR 1050 (42S01) at line 180: Table 'f
 ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 226: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 236: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 246: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 256: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 264: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 273: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 283: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 291: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 311: Table 'threads' already exists
+ERROR 1644 (HY000) at line 727: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -50,14 +52,16 @@ ERROR 1050 (42S01) at line 180: Table 'f
 ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 226: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 236: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 246: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 256: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 264: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 273: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 283: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 291: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 311: Table 'threads' already exists
+ERROR 1644 (HY000) at line 727: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -79,14 +83,16 @@ ERROR 1050 (42S01) at line 180: Table 'f
 ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 226: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 236: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 246: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 256: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 264: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 273: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 283: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 291: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 311: Table 'threads' already exists
+ERROR 1644 (HY000) at line 727: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -108,14 +114,16 @@ ERROR 1050 (42S01) at line 180: Table 'f
 ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 226: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 236: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 246: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 256: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 264: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 273: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 283: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 291: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 311: Table 'threads' already exists
+ERROR 1644 (HY000) at line 727: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -137,14 +145,16 @@ ERROR 1050 (42S01) at line 180: Table 'f
 ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 226: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 236: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 246: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 256: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 264: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 273: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 283: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 291: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 311: Table 'threads' already exists
+ERROR 1644 (HY000) at line 727: 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	2010-09-02 00:00:20 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result	2010-09-24 20:22:04 +0000
@@ -19,14 +19,16 @@ ERROR 1050 (42S01) at line 180: Table 'f
 ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 226: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 236: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 246: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 256: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 264: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 273: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 283: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 291: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 311: Table 'threads' already exists
+ERROR 1644 (HY000) at line 727: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -50,14 +52,16 @@ ERROR 1050 (42S01) at line 180: Table 'f
 ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 226: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 236: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 246: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 256: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 264: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 273: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 283: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 291: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 311: Table 'threads' already exists
+ERROR 1644 (HY000) at line 727: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -79,14 +83,16 @@ ERROR 1050 (42S01) at line 180: Table 'f
 ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 226: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 236: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 246: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 256: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 264: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 273: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 283: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 291: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 311: Table 'threads' already exists
+ERROR 1644 (HY000) at line 727: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -108,14 +114,16 @@ ERROR 1050 (42S01) at line 180: Table 'f
 ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 226: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 236: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 246: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 256: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 264: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 273: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 283: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 291: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 311: Table 'threads' already exists
+ERROR 1644 (HY000) at line 727: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -137,14 +145,16 @@ ERROR 1050 (42S01) at line 180: Table 'f
 ERROR 1050 (42S01) at line 191: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 203: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 212: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 222: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 232: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 242: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 250: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 259: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 267: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 287: Table 'threads' already exists
-ERROR 1644 (HY000) at line 703: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 226: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 236: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 246: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 256: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 264: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 273: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 283: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 291: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 311: Table 'threads' already exists
+ERROR 1644 (HY000) at line 727: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

=== removed file 'mysql-test/suite/perfschema/r/schema.result'
--- a/mysql-test/suite/perfschema/r/schema.result	2010-08-12 14:08:52 +0000
+++ b/mysql-test/suite/perfschema/r/schema.result	1970-01-01 00:00:00 +0000
@@ -1,200 +0,0 @@
-show databases;
-Database
-information_schema
-mtr
-mysql
-performance_schema
-test
-use performance_schema;
-show tables;
-Tables_in_performance_schema
-COND_INSTANCES
-EVENTS_WAITS_CURRENT
-EVENTS_WAITS_HISTORY
-EVENTS_WAITS_HISTORY_LONG
-EVENTS_WAITS_SUMMARY_BY_INSTANCE
-EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME
-EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME
-FILE_INSTANCES
-FILE_SUMMARY_BY_EVENT_NAME
-FILE_SUMMARY_BY_INSTANCE
-MUTEX_INSTANCES
-PERFORMANCE_TIMERS
-RWLOCK_INSTANCES
-SETUP_CONSUMERS
-SETUP_INSTRUMENTS
-SETUP_TIMERS
-THREADS
-show create table COND_INSTANCES;
-Table	Create Table
-COND_INSTANCES	CREATE TABLE `COND_INSTANCES` (
-  `NAME` varchar(128) NOT NULL,
-  `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table EVENTS_WAITS_CURRENT;
-Table	Create Table
-EVENTS_WAITS_CURRENT	CREATE TABLE `EVENTS_WAITS_CURRENT` (
-  `THREAD_ID` int(11) NOT NULL,
-  `EVENT_ID` bigint(20) unsigned NOT NULL,
-  `EVENT_NAME` varchar(128) NOT NULL,
-  `SOURCE` varchar(64) DEFAULT NULL,
-  `TIMER_START` bigint(20) unsigned DEFAULT NULL,
-  `TIMER_END` bigint(20) unsigned DEFAULT NULL,
-  `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
-  `SPINS` int(10) unsigned DEFAULT NULL,
-  `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
-  `OBJECT_NAME` varchar(512) DEFAULT NULL,
-  `OBJECT_TYPE` varchar(64) DEFAULT NULL,
-  `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
-  `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
-  `OPERATION` varchar(16) NOT NULL,
-  `NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL,
-  `FLAGS` int(10) unsigned DEFAULT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table EVENTS_WAITS_HISTORY;
-Table	Create Table
-EVENTS_WAITS_HISTORY	CREATE TABLE `EVENTS_WAITS_HISTORY` (
-  `THREAD_ID` int(11) NOT NULL,
-  `EVENT_ID` bigint(20) unsigned NOT NULL,
-  `EVENT_NAME` varchar(128) NOT NULL,
-  `SOURCE` varchar(64) DEFAULT NULL,
-  `TIMER_START` bigint(20) unsigned DEFAULT NULL,
-  `TIMER_END` bigint(20) unsigned DEFAULT NULL,
-  `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
-  `SPINS` int(10) unsigned DEFAULT NULL,
-  `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
-  `OBJECT_NAME` varchar(512) DEFAULT NULL,
-  `OBJECT_TYPE` varchar(64) DEFAULT NULL,
-  `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
-  `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
-  `OPERATION` varchar(16) NOT NULL,
-  `NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL,
-  `FLAGS` int(10) unsigned DEFAULT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table EVENTS_WAITS_HISTORY_LONG;
-Table	Create Table
-EVENTS_WAITS_HISTORY_LONG	CREATE TABLE `EVENTS_WAITS_HISTORY_LONG` (
-  `THREAD_ID` int(11) NOT NULL,
-  `EVENT_ID` bigint(20) unsigned NOT NULL,
-  `EVENT_NAME` varchar(128) NOT NULL,
-  `SOURCE` varchar(64) DEFAULT NULL,
-  `TIMER_START` bigint(20) unsigned DEFAULT NULL,
-  `TIMER_END` bigint(20) unsigned DEFAULT NULL,
-  `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
-  `SPINS` int(10) unsigned DEFAULT NULL,
-  `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
-  `OBJECT_NAME` varchar(512) DEFAULT NULL,
-  `OBJECT_TYPE` varchar(64) DEFAULT NULL,
-  `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
-  `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
-  `OPERATION` varchar(16) NOT NULL,
-  `NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL,
-  `FLAGS` int(10) unsigned DEFAULT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE;
-Table	Create Table
-EVENTS_WAITS_SUMMARY_BY_INSTANCE	CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_INSTANCE` (
-  `EVENT_NAME` varchar(128) NOT NULL,
-  `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
-  `COUNT_STAR` bigint(20) unsigned NOT NULL,
-  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
-  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
-  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
-  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME;
-Table	Create Table
-EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME	CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME` (
-  `THREAD_ID` int(11) NOT NULL,
-  `EVENT_NAME` varchar(128) NOT NULL,
-  `COUNT_STAR` bigint(20) unsigned NOT NULL,
-  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
-  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
-  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
-  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME;
-Table	Create Table
-EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME	CREATE TABLE `EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME` (
-  `EVENT_NAME` varchar(128) NOT NULL,
-  `COUNT_STAR` bigint(20) unsigned NOT NULL,
-  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
-  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
-  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
-  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table FILE_INSTANCES;
-Table	Create Table
-FILE_INSTANCES	CREATE TABLE `FILE_INSTANCES` (
-  `FILE_NAME` varchar(512) NOT NULL,
-  `EVENT_NAME` varchar(128) NOT NULL,
-  `OPEN_COUNT` int(10) unsigned NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table FILE_SUMMARY_BY_EVENT_NAME;
-Table	Create Table
-FILE_SUMMARY_BY_EVENT_NAME	CREATE TABLE `FILE_SUMMARY_BY_EVENT_NAME` (
-  `EVENT_NAME` varchar(128) NOT NULL,
-  `COUNT_READ` bigint(20) unsigned NOT NULL,
-  `COUNT_WRITE` bigint(20) unsigned NOT NULL,
-  `SUM_NUMBER_OF_BYTES_READ` bigint(20) unsigned NOT NULL,
-  `SUM_NUMBER_OF_BYTES_WRITE` bigint(20) unsigned NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table FILE_SUMMARY_BY_INSTANCE;
-Table	Create Table
-FILE_SUMMARY_BY_INSTANCE	CREATE TABLE `FILE_SUMMARY_BY_INSTANCE` (
-  `FILE_NAME` varchar(512) NOT NULL,
-  `EVENT_NAME` varchar(128) NOT NULL,
-  `COUNT_READ` bigint(20) unsigned NOT NULL,
-  `COUNT_WRITE` bigint(20) unsigned NOT NULL,
-  `SUM_NUMBER_OF_BYTES_READ` bigint(20) unsigned NOT NULL,
-  `SUM_NUMBER_OF_BYTES_WRITE` bigint(20) unsigned NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table MUTEX_INSTANCES;
-Table	Create Table
-MUTEX_INSTANCES	CREATE TABLE `MUTEX_INSTANCES` (
-  `NAME` varchar(128) NOT NULL,
-  `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
-  `LOCKED_BY_THREAD_ID` int(11) DEFAULT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table PERFORMANCE_TIMERS;
-Table	Create Table
-PERFORMANCE_TIMERS	CREATE TABLE `PERFORMANCE_TIMERS` (
-  `TIMER_NAME` enum('CYCLE','NANOSECOND','MICROSECOND','MILLISECOND','TICK') NOT NULL,
-  `TIMER_FREQUENCY` bigint(20) DEFAULT NULL,
-  `TIMER_RESOLUTION` bigint(20) DEFAULT NULL,
-  `TIMER_OVERHEAD` bigint(20) DEFAULT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table RWLOCK_INSTANCES;
-Table	Create Table
-RWLOCK_INSTANCES	CREATE TABLE `RWLOCK_INSTANCES` (
-  `NAME` varchar(128) NOT NULL,
-  `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
-  `WRITE_LOCKED_BY_THREAD_ID` int(11) DEFAULT NULL,
-  `READ_LOCKED_BY_COUNT` int(10) unsigned NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table SETUP_CONSUMERS;
-Table	Create Table
-SETUP_CONSUMERS	CREATE TABLE `SETUP_CONSUMERS` (
-  `NAME` varchar(64) NOT NULL,
-  `ENABLED` enum('YES','NO') NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table SETUP_INSTRUMENTS;
-Table	Create Table
-SETUP_INSTRUMENTS	CREATE TABLE `SETUP_INSTRUMENTS` (
-  `NAME` varchar(128) NOT NULL,
-  `ENABLED` enum('YES','NO') NOT NULL,
-  `TIMED` enum('YES','NO') NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table SETUP_TIMERS;
-Table	Create Table
-SETUP_TIMERS	CREATE TABLE `SETUP_TIMERS` (
-  `NAME` varchar(64) NOT NULL,
-  `TIMER_NAME` enum('CYCLE','NANOSECOND','MICROSECOND','MILLISECOND','TICK') NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
-show create table THREADS;
-Table	Create Table
-THREADS	CREATE TABLE `THREADS` (
-  `THREAD_ID` int(11) NOT NULL,
-  `ID` int(11) NOT NULL,
-  `NAME` varchar(64) NOT NULL
-) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8

=== modified file 'mysql-test/suite/perfschema/r/schema_lc1.result'
--- a/mysql-test/suite/perfschema/r/schema_lc1.result	2010-09-02 00:00:20 +0000
+++ b/mysql-test/suite/perfschema/r/schema_lc1.result	2010-09-24 20:22:04 +0000
@@ -18,11 +18,13 @@ file_instances
 file_summary_by_event_name
 file_summary_by_instance
 mutex_instances
+objects_summary_global_by_type
 performance_timers
 rwlock_instances
 setup_actors
 setup_consumers
 setup_instruments
+setup_objects
 setup_timers
 threads
 show create table COND_INSTANCES;
@@ -156,6 +158,18 @@ MUTEX_INSTANCES	CREATE TABLE `mutex_inst
   `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
   `LOCKED_BY_THREAD_ID` int(11) DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table OBJECTS_SUMMARY_GLOBAL_BY_TYPE;
+Table	Create Table
+OBJECTS_SUMMARY_GLOBAL_BY_TYPE	CREATE TABLE `objects_summary_global_by_type` (
+  `OBJECT_TYPE` varchar(64) DEFAULT NULL,
+  `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
+  `OBJECT_NAME` varchar(64) DEFAULT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table PERFORMANCE_TIMERS;
 Table	Create Table
 PERFORMANCE_TIMERS	CREATE TABLE `performance_timers` (
@@ -192,6 +206,14 @@ SETUP_INSTRUMENTS	CREATE TABLE `setup_in
   `ENABLED` enum('YES','NO') NOT NULL,
   `TIMED` enum('YES','NO') NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table SETUP_OBJECTS;
+Table	Create Table
+SETUP_OBJECTS	CREATE TABLE `setup_objects` (
+  `OBJECT_TYPE` enum('TABLE') NOT NULL DEFAULT 'TABLE',
+  `OBJECT_SCHEMA` varchar(64) DEFAULT '%',
+  `OBJECT_NAME` varchar(64) NOT NULL DEFAULT '%',
+  `TIMED` enum('YES','NO') NOT NULL DEFAULT 'YES'
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table SETUP_TIMERS;
 Table	Create Table
 SETUP_TIMERS	CREATE TABLE `setup_timers` (

=== modified file 'mysql-test/suite/perfschema/r/schema_lc2.result'
--- a/mysql-test/suite/perfschema/r/schema_lc2.result	2010-09-02 00:00:20 +0000
+++ b/mysql-test/suite/perfschema/r/schema_lc2.result	2010-09-24 20:22:04 +0000
@@ -18,11 +18,13 @@ FILE_INSTANCES
 FILE_SUMMARY_BY_EVENT_NAME
 FILE_SUMMARY_BY_INSTANCE
 MUTEX_INSTANCES
+OBJECTS_SUMMARY_GLOBAL_BY_TYPE
 PERFORMANCE_TIMERS
 RWLOCK_INSTANCES
 SETUP_ACTORS
 SETUP_CONSUMERS
 SETUP_INSTRUMENTS
+SETUP_OBJECTS
 SETUP_TIMERS
 THREADS
 show create table COND_INSTANCES;
@@ -156,6 +158,18 @@ MUTEX_INSTANCES	CREATE TABLE `MUTEX_INST
   `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
   `LOCKED_BY_THREAD_ID` int(11) DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table OBJECTS_SUMMARY_GLOBAL_BY_TYPE;
+Table	Create Table
+OBJECTS_SUMMARY_GLOBAL_BY_TYPE	CREATE TABLE `OBJECTS_SUMMARY_GLOBAL_BY_TYPE` (
+  `OBJECT_TYPE` varchar(64) DEFAULT NULL,
+  `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
+  `OBJECT_NAME` varchar(64) DEFAULT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table PERFORMANCE_TIMERS;
 Table	Create Table
 PERFORMANCE_TIMERS	CREATE TABLE `PERFORMANCE_TIMERS` (
@@ -192,6 +206,14 @@ SETUP_INSTRUMENTS	CREATE TABLE `SETUP_IN
   `ENABLED` enum('YES','NO') NOT NULL,
   `TIMED` enum('YES','NO') NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table SETUP_OBJECTS;
+Table	Create Table
+SETUP_OBJECTS	CREATE TABLE `SETUP_OBJECTS` (
+  `OBJECT_TYPE` enum('TABLE') NOT NULL DEFAULT 'TABLE',
+  `OBJECT_SCHEMA` varchar(64) DEFAULT '%',
+  `OBJECT_NAME` varchar(64) NOT NULL DEFAULT '%',
+  `TIMED` enum('YES','NO') NOT NULL DEFAULT 'YES'
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table SETUP_TIMERS;
 Table	Create Table
 SETUP_TIMERS	CREATE TABLE `SETUP_TIMERS` (


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100924202204-wr0hgzpbdfv72qpa.bundle
Thread
bzr commit into mysql-next-mr-wl4816 branch (marc.alff:3198) Marc Alff24 Sep