From: Marc Alff Date: September 2 2010 12:00am Subject: bzr commit into mysql-next-mr branch (marc.alff:3170) List-Archive: http://lists.mysql.com/commits/117376 Message-Id: <201009020001.o81I8JkA016163@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2653115128776232512==" --===============2653115128776232512== 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-wl4674/ based on revid:marc.alff@stripped 3170 Marc Alff 2010-09-01 Fixed the tests for lc1 and lc2 platforms 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 mysql-test/suite/perfschema/t/setup_actors.test === modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result' --- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result 2010-08-12 15:25:01 +0000 +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result 2010-09-02 00:00:20 +0000 @@ -21,11 +21,12 @@ ERROR 1050 (42S01) at line 203: Table 'f 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 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. +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. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -51,11 +52,12 @@ ERROR 1050 (42S01) at line 203: Table 'f 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 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. +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. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -79,11 +81,12 @@ ERROR 1050 (42S01) at line 203: Table 'f 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 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. +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. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -107,11 +110,12 @@ ERROR 1050 (42S01) at line 203: Table 'f 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 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. +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. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -135,11 +139,12 @@ ERROR 1050 (42S01) at line 203: Table 'f 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 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. +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. 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-01 22:59:33 +0000 +++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result 2010-09-02 00:00:20 +0000 @@ -21,21 +21,12 @@ ERROR 1050 (42S01) at line 203: Table 'f 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 -<<<<<<< TREE 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 262: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 299: Table 'threads' already exists -ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database. -======= -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. ->>>>>>> MERGE-SOURCE +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. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -61,21 +52,12 @@ ERROR 1050 (42S01) at line 203: Table 'f 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 -<<<<<<< TREE 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 262: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 299: Table 'threads' already exists -ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database. -======= -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. ->>>>>>> MERGE-SOURCE +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. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -99,21 +81,12 @@ ERROR 1050 (42S01) at line 203: Table 'f 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 -<<<<<<< TREE 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 262: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 299: Table 'threads' already exists -ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database. -======= -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. ->>>>>>> MERGE-SOURCE +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. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -137,21 +110,12 @@ ERROR 1050 (42S01) at line 203: Table 'f 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 -<<<<<<< TREE 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 262: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 299: Table 'threads' already exists -ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database. -======= -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. ->>>>>>> MERGE-SOURCE +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. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -175,21 +139,12 @@ ERROR 1050 (42S01) at line 203: Table 'f 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 -<<<<<<< TREE 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 262: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 271: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 279: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 299: Table 'threads' already exists -ERROR 1644 (HY000) at line 715: Unexpected content found in the performance_schema database. -======= -ERROR 1050 (42S01) at line 240: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 249: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 257: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 266: Table 'threads' already exists -ERROR 1644 (HY000) at line 682: Unexpected content found in the performance_schema database. ->>>>>>> MERGE-SOURCE +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. FATAL ERROR: Upgrade failed select name from mysql.event where db='performance_schema'; name === modified file 'mysql-test/suite/perfschema/r/schema_lc1.result' --- a/mysql-test/suite/perfschema/r/schema_lc1.result 2010-07-29 18:00:27 +0000 +++ b/mysql-test/suite/perfschema/r/schema_lc1.result 2010-09-02 00:00:20 +0000 @@ -11,9 +11,9 @@ cond_instances events_waits_current events_waits_history events_waits_history_long -events_waits_summary_by_event_name 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 @@ -23,7 +23,6 @@ rwlock_instances setup_actors setup_consumers setup_instruments -setup_objects setup_timers threads show create table COND_INSTANCES; @@ -92,31 +91,31 @@ EVENTS_WAITS_HISTORY_LONG CREATE TABLE ` `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_EVENT_NAME; +show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE; Table Create Table -EVENTS_WAITS_SUMMARY_BY_EVENT_NAME CREATE TABLE `events_waits_summary_by_event_name` ( +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_INSTANCE; +show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; Table Create Table -EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `events_waits_summary_by_instance` ( +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, - `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; +show create table EVENTS_WAITS_SUMMARY_GLOBAL_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, +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, @@ -193,16 +192,6 @@ 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` varchar(64) DEFAULT NULL, - `OBJECT_SCHEMA` varchar(64) DEFAULT NULL, - `OBJECT_NAME` varchar(64) DEFAULT NULL, - `ENABLED` enum('YES','NO') NOT NULL, - `TIMED` enum('YES','NO') NOT NULL, - `AGGREGATED` 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` ( === modified file 'mysql-test/suite/perfschema/r/schema_lc2.result' --- a/mysql-test/suite/perfschema/r/schema_lc2.result 2010-07-29 18:00:27 +0000 +++ b/mysql-test/suite/perfschema/r/schema_lc2.result 2010-09-02 00:00:20 +0000 @@ -11,9 +11,9 @@ COND_INSTANCES EVENTS_WAITS_CURRENT EVENTS_WAITS_HISTORY EVENTS_WAITS_HISTORY_LONG -EVENTS_WAITS_SUMMARY_BY_EVENT_NAME 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 @@ -23,7 +23,6 @@ RWLOCK_INSTANCES SETUP_ACTORS SETUP_CONSUMERS SETUP_INSTRUMENTS -SETUP_OBJECTS SETUP_TIMERS THREADS show create table COND_INSTANCES; @@ -92,31 +91,31 @@ EVENTS_WAITS_HISTORY_LONG CREATE TABLE ` `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_EVENT_NAME; +show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE; Table Create Table -EVENTS_WAITS_SUMMARY_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_EVENT_NAME` ( +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_INSTANCE; +show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; Table Create Table -EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_INSTANCE` ( +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, - `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; +show create table EVENTS_WAITS_SUMMARY_GLOBAL_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, +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, @@ -193,16 +192,6 @@ 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` varchar(64) DEFAULT NULL, - `OBJECT_SCHEMA` varchar(64) DEFAULT NULL, - `OBJECT_NAME` varchar(64) DEFAULT NULL, - `ENABLED` enum('YES','NO') NOT NULL, - `TIMED` enum('YES','NO') NOT NULL, - `AGGREGATED` 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` ( === modified file 'mysql-test/suite/perfschema/t/setup_actors.test' --- a/mysql-test/suite/perfschema/t/setup_actors.test 2010-09-01 22:59:33 +0000 +++ b/mysql-test/suite/perfschema/t/setup_actors.test 2010-09-02 00:00:20 +0000 @@ -218,6 +218,7 @@ where PROCESSLIST_ID = connection_id(); --echo # Switch to (con5, localhost, user5, , ) connect (con5, localhost, user5, , ); +--replace_result '\'threads' '\'THREADS' --error ER_TABLEACCESS_DENIED_ERROR select * from performance_schema.THREADS; # 1. INSTRUMENTED must be YES because there are two matches --===============2653115128776232512== 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-wl4674/ # testament_sha1: 6f6b1edb9dcf7639bdbe229c20d5bf44d634c5e0 # timestamp: 2010-09-01 18:00:25 -0600 # source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr/ # base_revision_id: marc.alff@stripped\ # 1qbg7k9zhrehkwo7 # # Begin bundle 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 --===============2653115128776232512==--