From: Marc Alff Date: September 24 2010 8:22pm Subject: bzr commit into mysql-next-mr-wl4816 branch (marc.alff:3198) List-Archive: http://lists.mysql.com/commits/119097 Message-Id: <201009242023.o8OJNP1Z024544@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0906748120440608777==" --===============0906748120440608777== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #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` ( --===============0906748120440608777== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-wl4816/ # testament_sha1: 3599afee6d2323ac6380eb586e99cfc8ee3c4741 # timestamp: 2010-09-24 14:22:10 -0600 # base_revision_id: marc.alff@stripped\ # l03vi0n65jw2vza8 # # Begin bundle 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 mklntaSV9M7rOcafYT/8XckU4UJCOALVFA== --===============0906748120440608777==--