From: Marc Alff Date: November 9 2010 2:34pm Subject: bzr commit into mysql-next-mr branch (marc.alff:3376) List-Archive: http://lists.mysql.com/commits/123280 Message-Id: <201011091436.oA9Ea18j002178@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1915983950751350705==" --===============1915983950751350705== 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-bugfixing-merge/ based on revid:tor.didriksen@stripped 3376 Marc Alff 2010-11-09 Post merge fix for tests specific to mysql-next-mr removed: mysql-test/suite/perfschema/r/threads_events.result modified: mysql-test/suite/perfschema/r/ddl_setup_actors.result mysql-test/suite/perfschema/r/ddl_threads.result mysql-test/suite/perfschema/r/dml_setup_actors.result mysql-test/suite/perfschema/r/dml_threads.result mysql-test/suite/perfschema/r/func_file_io.result mysql-test/suite/perfschema/r/schema_lc0.result mysql-test/suite/perfschema/r/schema_lc1.result mysql-test/suite/perfschema/r/setup_actors.result mysql-test/suite/perfschema/r/start_server_no_setup_actors.result mysql-test/suite/perfschema/r/threads_innodb.result mysql-test/suite/perfschema/r/threads_insert_delayed.result mysql-test/suite/perfschema/r/threads_mysql.result mysql-test/suite/perfschema/t/ddl_setup_actors.test mysql-test/suite/perfschema/t/ddl_threads.test mysql-test/suite/perfschema/t/dml_setup_actors.test mysql-test/suite/perfschema/t/dml_threads.test mysql-test/suite/perfschema/t/func_file_io.test mysql-test/suite/perfschema/t/setup_actors.test mysql-test/suite/perfschema/t/start_server_no_setup_actors.test mysql-test/suite/perfschema/t/threads_innodb.test mysql-test/suite/perfschema/t/threads_insert_delayed.test mysql-test/suite/perfschema/t/threads_mysql.test === modified file 'mysql-test/suite/perfschema/r/ddl_setup_actors.result' --- a/mysql-test/suite/perfschema/r/ddl_setup_actors.result 2010-11-09 08:16:50 +0000 +++ b/mysql-test/suite/perfschema/r/ddl_setup_actors.result 2010-11-09 14:34:29 +0000 @@ -1,7 +1,7 @@ alter table performance_schema.setup_actors add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' drop table if exists test.setup_actors; -create table test.SETUP_ACTORS as +create table test.setup_actors as select * from performance_schema.setup_actors; truncate table performance_schema.setup_actors; select count(*) from performance_schema.setup_actors; === modified file 'mysql-test/suite/perfschema/r/ddl_threads.result' --- a/mysql-test/suite/perfschema/r/ddl_threads.result 2010-05-11 10:36:37 +0000 +++ b/mysql-test/suite/perfschema/r/ddl_threads.result 2010-11-09 14:34:29 +0000 @@ -1,8 +1,8 @@ -alter table performance_schema.THREADS add column foo integer; +alter table performance_schema.threads add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.THREADS; +truncate table performance_schema.threads; ERROR HY000: Invalid performance_schema usage. -ALTER TABLE performance_schema.THREADS ADD INDEX test_index(PROCESSLIST_ID); +ALTER TABLE performance_schema.threads ADD INDEX test_index(PROCESSLIST_ID); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.THREADS(PROCESSLIST_ID); +CREATE UNIQUE INDEX test_index ON performance_schema.threads(PROCESSLIST_ID); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' === modified file 'mysql-test/suite/perfschema/r/dml_setup_actors.result' --- a/mysql-test/suite/perfschema/r/dml_setup_actors.result 2010-05-12 14:04:32 +0000 +++ b/mysql-test/suite/perfschema/r/dml_setup_actors.result 2010-11-09 14:34:29 +0000 @@ -1,60 +1,60 @@ -drop table if exists test.SETUP_ACTORS; -create table test.SETUP_ACTORS as -select * from performance_schema.SETUP_ACTORS; -truncate table performance_schema.SETUP_ACTORS; -select * from performance_schema.SETUP_ACTORS; +drop table if exists test.setup_actors; +create table test.setup_actors as +select * from performance_schema.setup_actors; +truncate table performance_schema.setup_actors; +select * from performance_schema.setup_actors; HOST USER ROLE -select * from performance_schema.SETUP_ACTORS +select * from performance_schema.setup_actors where user = '%'; HOST USER ROLE -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors set user='Joe', host='localhost'; -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors set user='Joe', host='%'; -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors set user='%', host='server1'; -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors set user='%', host='%'; -select * from performance_schema.SETUP_ACTORS +select * from performance_schema.setup_actors order by USER, HOST; HOST USER ROLE % % % server1 % % % Joe % localhost Joe % -update performance_schema.SETUP_ACTORS +update performance_schema.setup_actors set user='ILLEGAL'; ERROR HY000: Invalid performance_schema usage. -update performance_schema.SETUP_ACTORS +update performance_schema.setup_actors set host='ILLEGAL'; ERROR HY000: Invalid performance_schema usage. -update performance_schema.SETUP_ACTORS +update performance_schema.setup_actors set role='ILLEGAL'; ERROR HY000: Invalid performance_schema usage. -select * from performance_schema.SETUP_ACTORS +select * from performance_schema.setup_actors order by USER, HOST; HOST USER ROLE % % % server1 % % % Joe % localhost Joe % -delete from performance_schema.SETUP_ACTORS +delete from performance_schema.setup_actors where user = 'Joe' and host = 'localhost'; -select * from performance_schema.SETUP_ACTORS +select * from performance_schema.setup_actors order by USER, HOST; HOST USER ROLE % % % server1 % % % Joe % -delete from performance_schema.SETUP_ACTORS; -select * from performance_schema.SETUP_ACTORS +delete from performance_schema.setup_actors; +select * from performance_schema.setup_actors order by USER, HOST; HOST USER ROLE -LOCK TABLES performance_schema.SETUP_ACTORS READ; +LOCK TABLES performance_schema.setup_actors READ; UNLOCK TABLES; -LOCK TABLES performance_schema.SETUP_ACTORS WRITE; +LOCK TABLES performance_schema.setup_actors WRITE; UNLOCK TABLES; -truncate table performance_schema.SETUP_ACTORS; -insert into performance_schema.SETUP_ACTORS -select * from test.SETUP_ACTORS; -drop table test.SETUP_ACTORS; +truncate table performance_schema.setup_actors; +insert into performance_schema.setup_actors +select * from test.setup_actors; +drop table test.setup_actors; === modified file 'mysql-test/suite/perfschema/r/dml_threads.result' --- a/mysql-test/suite/perfschema/r/dml_threads.result 2010-11-09 08:16:50 +0000 +++ b/mysql-test/suite/perfschema/r/dml_threads.result 2010-11-09 14:34:29 +0000 @@ -1,8 +1,8 @@ -select * from performance_schema.THREADS +select * from performance_schema.threads where name like 'Thread/%' limit 1; THREAD_ID NAME TYPE PROCESSLIST_ID PROCESSLIST_USER PROCESSLIST_HOST PROCESSLIST_DB PROCESSLIST_COMMAND PROCESSLIST_TIME PROCESSLIST_STATE PROCESSLIST_INFO PARENT_THREAD_ID ROLE INSTRUMENTED # # # # # # # # # # # # # # -select * from performance_schema.THREADS +select * from performance_schema.threads where name='FOO'; THREAD_ID NAME TYPE PROCESSLIST_ID PROCESSLIST_USER PROCESSLIST_HOST PROCESSLIST_DB PROCESSLIST_COMMAND PROCESSLIST_TIME PROCESSLIST_STATE PROCESSLIST_INFO PARENT_THREAD_ID ROLE INSTRUMENTED insert into performance_schema.threads @@ -16,7 +16,7 @@ set thread_id=12 where PROCESSLIST_ID=co ERROR HY000: Invalid performance_schema usage. update performance_schema.threads set instrumented= 'NO' where PROCESSLIST_ID=connection_id(); -select instrumented from performance_schema.THREADS +select instrumented from performance_schema.threads where PROCESSLIST_ID=connection_id(); instrumented NO === modified file 'mysql-test/suite/perfschema/r/func_file_io.result' --- a/mysql-test/suite/perfschema/r/func_file_io.result 2010-11-09 08:16:50 +0000 +++ b/mysql-test/suite/perfschema/r/func_file_io.result 2010-11-09 14:34:29 +0000 @@ -1,7 +1,7 @@ UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES'; UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/io/file/%'; -update performance_schema.THREADS SET instrumented = 'YES' +update performance_schema.threads SET instrumented = 'YES' WHERE PROCESSLIST_ID=connection_id(); DROP TABLE IF EXISTS t1; CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value') === modified file 'mysql-test/suite/perfschema/r/schema_lc0.result' --- a/mysql-test/suite/perfschema/r/schema_lc0.result 2010-09-01 22:59:33 +0000 +++ b/mysql-test/suite/perfschema/r/schema_lc0.result 2010-11-09 14:34:29 +0000 @@ -7,33 +7,33 @@ performance_schema CREATE DATABASE `perf 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_ACTORS -SETUP_CONSUMERS -SETUP_INSTRUMENTS -SETUP_TIMERS -THREADS -show create table COND_INSTANCES; +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_actors +setup_consumers +setup_instruments +setup_timers +threads +show create table cond_instances; Table Create Table -COND_INSTANCES CREATE TABLE `COND_INSTANCES` ( +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; +show create table events_waits_current; Table Create Table -EVENTS_WAITS_CURRENT CREATE TABLE `EVENTS_WAITS_CURRENT` ( +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, @@ -51,9 +51,9 @@ EVENTS_WAITS_CURRENT CREATE TABLE `EVENT `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; +show create table events_waits_history; Table Create Table -EVENTS_WAITS_HISTORY CREATE TABLE `EVENTS_WAITS_HISTORY` ( +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, @@ -71,9 +71,9 @@ EVENTS_WAITS_HISTORY CREATE TABLE `EVENT `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; +show create table events_waits_history_long; Table Create Table -EVENTS_WAITS_HISTORY_LONG CREATE TABLE `EVENTS_WAITS_HISTORY_LONG` ( +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, @@ -91,9 +91,9 @@ 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_INSTANCE; +show create table events_waits_summary_by_instance; Table Create Table -EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_INSTANCE` ( +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, @@ -102,9 +102,9 @@ EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE `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_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` ( +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, @@ -113,9 +113,9 @@ EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_ `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; +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` ( +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, @@ -123,25 +123,25 @@ EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAM `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; +show create table file_instances; Table Create Table -FILE_INSTANCES CREATE TABLE `FILE_INSTANCES` ( +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; +show create table file_summary_by_event_name; Table Create Table -FILE_SUMMARY_BY_EVENT_NAME CREATE TABLE `FILE_SUMMARY_BY_EVENT_NAME` ( +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; +show create table file_summary_by_instance; Table Create Table -FILE_SUMMARY_BY_INSTANCE CREATE TABLE `FILE_SUMMARY_BY_INSTANCE` ( +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, @@ -149,58 +149,58 @@ FILE_SUMMARY_BY_INSTANCE CREATE TABLE `F `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; +show create table mutex_instances; Table Create Table -MUTEX_INSTANCES CREATE TABLE `MUTEX_INSTANCES` ( +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; +show create table performance_timers; Table Create Table -PERFORMANCE_TIMERS CREATE TABLE `PERFORMANCE_TIMERS` ( +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; +show create table rwlock_instances; Table Create Table -RWLOCK_INSTANCES CREATE TABLE `RWLOCK_INSTANCES` ( +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_ACTORS; +show create table setup_actors; Table Create Table -SETUP_ACTORS CREATE TABLE `SETUP_ACTORS` ( +setup_actors CREATE TABLE `setup_actors` ( `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%', `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%', `ROLE` char(16) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%' ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 -show create table SETUP_CONSUMERS; +show create table setup_consumers; Table Create Table -SETUP_CONSUMERS CREATE TABLE `SETUP_CONSUMERS` ( +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; +show create table setup_instruments; Table Create Table -SETUP_INSTRUMENTS CREATE TABLE `SETUP_INSTRUMENTS` ( +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; +show create table setup_timers; Table Create Table -SETUP_TIMERS CREATE TABLE `SETUP_TIMERS` ( +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; +show create table threads; Table Create Table -THREADS CREATE TABLE `THREADS` ( +threads CREATE TABLE `threads` ( `THREAD_ID` int(11) NOT NULL, `NAME` varchar(128) NOT NULL, `TYPE` varchar(10) NOT NULL, === 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-11-09 14:34:29 +0000 @@ -25,15 +25,15 @@ setup_consumers setup_instruments setup_timers threads -show create table COND_INSTANCES; +show create table cond_instances; Table Create Table -COND_INSTANCES CREATE TABLE `cond_instances` ( +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; +show create table events_waits_current; Table Create Table -EVENTS_WAITS_CURRENT CREATE TABLE `events_waits_current` ( +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, @@ -51,9 +51,9 @@ EVENTS_WAITS_CURRENT CREATE TABLE `event `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; +show create table events_waits_history; Table Create Table -EVENTS_WAITS_HISTORY CREATE TABLE `events_waits_history` ( +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, @@ -71,9 +71,9 @@ EVENTS_WAITS_HISTORY CREATE TABLE `event `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; +show create table events_waits_history_long; Table Create Table -EVENTS_WAITS_HISTORY_LONG CREATE TABLE `events_waits_history_long` ( +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, @@ -91,9 +91,9 @@ 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_INSTANCE; +show create table events_waits_summary_by_instance; Table Create Table -EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `events_waits_summary_by_instance` ( +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, @@ -102,9 +102,9 @@ EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE `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_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` ( +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, @@ -113,9 +113,9 @@ EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_ `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; +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` ( +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, @@ -123,25 +123,25 @@ EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAM `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; +show create table file_instances; Table Create Table -FILE_INSTANCES CREATE TABLE `file_instances` ( +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; +show create table file_summary_by_event_name; Table Create Table -FILE_SUMMARY_BY_EVENT_NAME CREATE TABLE `file_summary_by_event_name` ( +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; +show create table file_summary_by_instance; Table Create Table -FILE_SUMMARY_BY_INSTANCE CREATE TABLE `file_summary_by_instance` ( +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, @@ -149,58 +149,58 @@ FILE_SUMMARY_BY_INSTANCE CREATE TABLE `f `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; +show create table mutex_instances; Table Create Table -MUTEX_INSTANCES CREATE TABLE `mutex_instances` ( +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; +show create table performance_timers; Table Create Table -PERFORMANCE_TIMERS CREATE TABLE `performance_timers` ( +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; +show create table rwlock_instances; Table Create Table -RWLOCK_INSTANCES CREATE TABLE `rwlock_instances` ( +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_ACTORS; +show create table setup_actors; Table Create Table -SETUP_ACTORS CREATE TABLE `setup_actors` ( +setup_actors CREATE TABLE `setup_actors` ( `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%', `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%', `ROLE` char(16) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%' ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 -show create table SETUP_CONSUMERS; +show create table setup_consumers; Table Create Table -SETUP_CONSUMERS CREATE TABLE `setup_consumers` ( +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; +show create table setup_instruments; Table Create Table -SETUP_INSTRUMENTS CREATE TABLE `setup_instruments` ( +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; +show create table setup_timers; Table Create Table -SETUP_TIMERS CREATE TABLE `setup_timers` ( +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; +show create table threads; Table Create Table -THREADS CREATE TABLE `threads` ( +threads CREATE TABLE `threads` ( `THREAD_ID` int(11) NOT NULL, `NAME` varchar(128) NOT NULL, `TYPE` varchar(10) NOT NULL, === modified file 'mysql-test/suite/perfschema/r/setup_actors.result' --- a/mysql-test/suite/perfschema/r/setup_actors.result 2010-11-09 08:16:50 +0000 +++ b/mysql-test/suite/perfschema/r/setup_actors.result 2010-11-09 14:34:29 +0000 @@ -1,16 +1,16 @@ -select * from performance_schema.SETUP_ACTORS; +select * from performance_schema.setup_actors; HOST USER ROLE % % % -truncate table performance_schema.SETUP_ACTORS; -insert into performance_schema.SETUP_ACTORS +truncate table performance_schema.setup_actors; +insert into performance_schema.setup_actors values ('hosta', 'user1', '%'); -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('%', 'user2', '%'); -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('localhost', 'user3', '%'); -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('hostb', '%', '%'); -select * from performance_schema.SETUP_ACTORS +select * from performance_schema.setup_actors order by USER, HOST, ROLE; HOST USER ROLE hostb % % @@ -25,23 +25,23 @@ grant select on test.* to user5@localhos flush privileges; # Switch to (con1, localhost, user1, , ) select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID = connection_id(); NAME TYPE INSTRUMENTED PROCESSLIST_USER PROCESSLIST_HOST thread/sql/one_connection FOREGROUND NO user1 localhost # Switch to connection default -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('%', 'user1', '%'); # Switch to connection con1 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID = connection_id(); NAME TYPE INSTRUMENTED PROCESSLIST_USER PROCESSLIST_HOST thread/sql/one_connection FOREGROUND NO user1 localhost # Disconnect con1 # Switch to (con2, localhost, user2, , ) select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID=connection_id(); NAME TYPE INSTRUMENTED PROCESSLIST_USER PROCESSLIST_HOST thread/sql/one_connection FOREGROUND YES user2 localhost @@ -52,7 +52,7 @@ create table test.t1 (col1 bigint); lock table test.t1 write; # Switch to (con3, localhost, user3, , ) select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID = connection_id(); NAME TYPE INSTRUMENTED PROCESSLIST_USER PROCESSLIST_HOST thread/sql/one_connection FOREGROUND YES user3 localhost @@ -62,7 +62,7 @@ insert into test.t1 set col1 = 1; # Switch to (con4, localhost, user4, , ) # Poll till INFO is no more NULL and State = 'Waiting for table metadata lock'. select count(*) = 1 -from performance_schema.THREADS T inner join information_schema.PROCESSLIST P +from performance_schema.threads T inner join information_schema.PROCESSLIST P on T.PROCESSLIST_ID = P.ID and T.PROCESSLIST_USER = P.USER and T.PROCESSLIST_HOST = P.HOST and T.PROCESSLIST_DB = P.DB and T.PROCESSLIST_COMMAND = P.COMMAND and T.PROCESSLIST_INFO = P.INFO @@ -77,15 +77,15 @@ drop table test.t1; # Disconnect con3 # Switch to connection con4 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID = connection_id(); NAME TYPE INSTRUMENTED PROCESSLIST_USER PROCESSLIST_HOST thread/sql/one_connection FOREGROUND NO user4 localhost # Disconnect con4 # Switch to connection default -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('localhost', '%', '%'); -select * from performance_schema.SETUP_ACTORS +select * from performance_schema.setup_actors order by USER, HOST, ROLE; HOST USER ROLE hostb % % @@ -96,16 +96,16 @@ hosta user1 % localhost user3 % # Switch to (con4b, localhost, user4, , ) select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID = connection_id(); NAME TYPE INSTRUMENTED PROCESSLIST_USER PROCESSLIST_HOST thread/sql/one_connection FOREGROUND YES user4 localhost # Disconnect con4b # Switch to connection default -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('%', 'user5', '%'); create sql security definer view test.v1 as select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID = connection_id(); # Switch to (con5, localhost, user5, , ) select * from performance_schema.threads; @@ -127,9 +127,9 @@ drop user user3@localhost; drop user user4@localhost; drop user user5@localhost; flush privileges; -truncate table performance_schema.SETUP_ACTORS; -insert into performance_schema.SETUP_ACTORS +truncate table performance_schema.setup_actors; +insert into performance_schema.setup_actors values ('%', '%', '%'); -select * from performance_schema.SETUP_ACTORS; +select * from performance_schema.setup_actors; HOST USER ROLE % % % === modified file 'mysql-test/suite/perfschema/r/start_server_no_setup_actors.result' --- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result 2010-11-09 08:16:50 +0000 +++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result 2010-11-09 14:34:29 +0000 @@ -59,6 +59,6 @@ show status like "performance_schema%"; show variables like "performance_schema_setup_actors_size"; Variable_name Value performance_schema_setup_actors_size 0 -select count(*) from performance_schema.SETUP_ACTORS; +select count(*) from performance_schema.setup_actors; count(*) 0 === removed file 'mysql-test/suite/perfschema/r/threads_events.result' --- a/mysql-test/suite/perfschema/r/threads_events.result 2010-07-29 18:00:27 +0000 +++ b/mysql-test/suite/perfschema/r/threads_events.result 1970-01-01 00:00:00 +0000 @@ -1,17 +0,0 @@ -DROP TABLE IF EXISTS t_event; -DROP EVENT IF EXISTS t_ps_event; -CREATE TABLE t_event AS -SELECT EVENT_ID FROM performance_schema.EVENTS_WAITS_CURRENT -WHERE 1 = 2; -CREATE EVENT t_ps_event -ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 SECOND -DO INSERT INTO t_event -SELECT DISTINCT EVENT_ID -FROM performance_schema.EVENTS_WAITS_CURRENT -JOIN performance_schema.EVENTS_WAITS_HISTORY USING (EVENT_ID) -ORDER BY EVENT_ID -LIMIT 1; -SELECT * FROM t_event; -EVENT_ID -[EVENT_ID] -DROP TABLE t_event; === modified file 'mysql-test/suite/perfschema/r/threads_innodb.result' --- a/mysql-test/suite/perfschema/r/threads_innodb.result 2010-07-29 18:00:27 +0000 +++ b/mysql-test/suite/perfschema/r/threads_innodb.result 2010-11-09 14:34:29 +0000 @@ -1,7 +1,7 @@ SELECT name, type, processlist_user, processlist_host, processlist_db, processlist_command, processlist_time, processlist_state, processlist_info, parent_thread_id, role, instrumented -FROM performance_schema.THREADS +FROM performance_schema.threads WHERE name LIKE 'thread/innodb/%' GROUP BY name; name type processlist_user processlist_host processlist_db processlist_command processlist_time processlist_state processlist_info parent_thread_id role instrumented === modified file 'mysql-test/suite/perfschema/r/threads_insert_delayed.result' --- a/mysql-test/suite/perfschema/r/threads_insert_delayed.result 2010-07-29 18:00:27 +0000 +++ b/mysql-test/suite/perfschema/r/threads_insert_delayed.result 2010-11-09 14:34:29 +0000 @@ -2,16 +2,16 @@ DROP TABLE IF EXISTS t1; DROP TEMPORARY TABLE IF EXISTS t2; CREATE TABLE t1 (f1 BIGINT) ENGINE = MyISAM; CREATE TEMPORARY TABLE t2 AS -SELECT thread_id FROM performance_schema.THREADS WHERE 1 = 2; -SELECT COUNT(*) = 0 AS expect_1 FROM performance_schema.THREADS +SELECT thread_id FROM performance_schema.threads WHERE 1 = 2; +SELECT COUNT(*) = 0 AS expect_1 FROM performance_schema.threads WHERE name = 'thread/sql/delayed_insert'; expect_1 1 INSERT INTO t2 SELECT thread_id -FROM performance_schema.THREADS; +FROM performance_schema.threads; INSERT DELAYED INTO t1 SET f1 = SLEEP(3); SELECT name, type, instrumented, processlist_user, processlist_host -FROM performance_schema.THREADS +FROM performance_schema.threads WHERE thread_id NOT IN (SELECT thread_id FROM t2); name type instrumented processlist_user processlist_host thread/sql/delayed_insert FOREGROUND YES root localhost === modified file 'mysql-test/suite/perfschema/r/threads_mysql.result' --- a/mysql-test/suite/perfschema/r/threads_mysql.result 2010-09-01 19:14:10 +0000 +++ b/mysql-test/suite/perfschema/r/threads_mysql.result 2010-11-09 14:34:29 +0000 @@ -4,7 +4,7 @@ processlist_command, processlist_info, IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id') AS unified_parent_thread_id, role, instrumented -FROM performance_schema.THREADS +FROM performance_schema.threads WHERE name LIKE 'thread/sql%' ORDER BY name; name thread/sql/main @@ -28,7 +28,7 @@ processlist_command, processlist_info, IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id') AS unified_parent_thread_id, role, instrumented -FROM performance_schema.THREADS +FROM performance_schema.threads WHERE name LIKE 'thread/sql%' ORDER BY name unified_parent_thread_id unified parent_thread_id @@ -45,7 +45,7 @@ unified_parent_thread_id unified parent_ role NULL instrumented YES CREATE TEMPORARY TABLE t1 AS -SELECT thread_id FROM performance_schema.THREADS +SELECT thread_id FROM performance_schema.threads WHERE name LIKE 'thread/sql%'; SET GLOBAL event_scheduler = ON; SELECT name, type, processlist_user, processlist_host, processlist_db, @@ -53,7 +53,7 @@ processlist_command, processlist_info, IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id') AS unified_parent_thread_id, role, instrumented -FROM performance_schema.THREADS +FROM performance_schema.threads WHERE name LIKE 'thread/sql%' AND thread_id NOT IN (SELECT thread_id FROM t1) ORDER BY name; @@ -69,7 +69,7 @@ role NULL instrumented YES TRUNCATE t1; INSERT INTO t1 -SELECT thread_id FROM performance_schema.THREADS +SELECT thread_id FROM performance_schema.threads WHERE name LIKE 'thread/sql%'; SELECT COUNT(*) INTO @aux FROM t1; DROP EVENT IF EXISTS t_ps_event; @@ -81,7 +81,7 @@ processlist_command, processlist_info, IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id') AS unified_parent_thread_id, role, instrumented -FROM performance_schema.THREADS +FROM performance_schema.threads WHERE name LIKE 'thread/sql%' AND thread_id NOT IN (SELECT thread_id FROM t1) ORDER BY name; @@ -96,7 +96,7 @@ unified_parent_thread_id unified parent_ role NULL instrumented YES SELECT t2.name AS parent_thread_name, t1.name AS child_thread_name -FROM performance_schema.THREADS t1 INNER JOIN performance_schema.THREADS t2 +FROM performance_schema.threads t1 INNER JOIN performance_schema.threads t2 ON t1.parent_thread_id = t2.thread_id WHERE t1.name LIKE 'thread/sql%' AND t1.parent_thread_id IS NOT NULL === modified file 'mysql-test/suite/perfschema/t/ddl_setup_actors.test' --- a/mysql-test/suite/perfschema/t/ddl_setup_actors.test 2010-11-09 08:16:50 +0000 +++ b/mysql-test/suite/perfschema/t/ddl_setup_actors.test 2010-11-09 14:34:29 +0000 @@ -25,7 +25,7 @@ alter table performance_schema.setup_act drop table if exists test.setup_actors; --enable_warnings -create table test.SETUP_ACTORS as +create table test.setup_actors as select * from performance_schema.setup_actors; truncate table performance_schema.setup_actors; === modified file 'mysql-test/suite/perfschema/t/ddl_threads.test' --- a/mysql-test/suite/perfschema/t/ddl_threads.test 2010-07-02 16:36:20 +0000 +++ b/mysql-test/suite/perfschema/t/ddl_threads.test 2010-11-09 14:34:29 +0000 @@ -19,14 +19,14 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.THREADS add column foo integer; +alter table performance_schema.threads add column foo integer; -- error ER_WRONG_PERFSCHEMA_USAGE -truncate table performance_schema.THREADS; +truncate table performance_schema.threads; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.THREADS ADD INDEX test_index(PROCESSLIST_ID); +ALTER TABLE performance_schema.threads ADD INDEX test_index(PROCESSLIST_ID); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.THREADS(PROCESSLIST_ID); +CREATE UNIQUE INDEX test_index ON performance_schema.threads(PROCESSLIST_ID); === modified file 'mysql-test/suite/perfschema/t/dml_setup_actors.test' --- a/mysql-test/suite/perfschema/t/dml_setup_actors.test 2010-07-02 16:36:20 +0000 +++ b/mysql-test/suite/perfschema/t/dml_setup_actors.test 2010-11-09 14:34:29 +0000 @@ -19,69 +19,69 @@ --source include/have_perfschema.inc --disable_warnings -drop table if exists test.SETUP_ACTORS; +drop table if exists test.setup_actors; --enable_warnings # Save the setup -create table test.SETUP_ACTORS as - select * from performance_schema.SETUP_ACTORS; -truncate table performance_schema.SETUP_ACTORS; +create table test.setup_actors as + select * from performance_schema.setup_actors; +truncate table performance_schema.setup_actors; -select * from performance_schema.SETUP_ACTORS; +select * from performance_schema.setup_actors; -select * from performance_schema.SETUP_ACTORS +select * from performance_schema.setup_actors where user = '%'; -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors set user='Joe', host='localhost'; -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors set user='Joe', host='%'; -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors set user='%', host='server1'; -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors set user='%', host='%'; -select * from performance_schema.SETUP_ACTORS +select * from performance_schema.setup_actors order by USER, HOST; --error ER_WRONG_PERFSCHEMA_USAGE -update performance_schema.SETUP_ACTORS +update performance_schema.setup_actors set user='ILLEGAL'; --error ER_WRONG_PERFSCHEMA_USAGE -update performance_schema.SETUP_ACTORS +update performance_schema.setup_actors set host='ILLEGAL'; --error ER_WRONG_PERFSCHEMA_USAGE -update performance_schema.SETUP_ACTORS +update performance_schema.setup_actors set role='ILLEGAL'; -select * from performance_schema.SETUP_ACTORS +select * from performance_schema.setup_actors order by USER, HOST; -delete from performance_schema.SETUP_ACTORS +delete from performance_schema.setup_actors where user = 'Joe' and host = 'localhost'; -select * from performance_schema.SETUP_ACTORS +select * from performance_schema.setup_actors order by USER, HOST; -delete from performance_schema.SETUP_ACTORS; +delete from performance_schema.setup_actors; -select * from performance_schema.SETUP_ACTORS +select * from performance_schema.setup_actors order by USER, HOST; -LOCK TABLES performance_schema.SETUP_ACTORS READ; +LOCK TABLES performance_schema.setup_actors READ; UNLOCK TABLES; -LOCK TABLES performance_schema.SETUP_ACTORS WRITE; +LOCK TABLES performance_schema.setup_actors WRITE; UNLOCK TABLES; # Restore the setup -truncate table performance_schema.SETUP_ACTORS; -insert into performance_schema.SETUP_ACTORS - select * from test.SETUP_ACTORS; -drop table test.SETUP_ACTORS; +truncate table performance_schema.setup_actors; +insert into performance_schema.setup_actors + select * from test.setup_actors; +drop table test.setup_actors; === modified file 'mysql-test/suite/perfschema/t/dml_threads.test' --- a/mysql-test/suite/perfschema/t/dml_threads.test 2010-11-09 08:16:50 +0000 +++ b/mysql-test/suite/perfschema/t/dml_threads.test 2010-11-09 14:34:29 +0000 @@ -19,10 +19,10 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 11 # 12 # 13 # 14 # -select * from performance_schema.THREADS +select * from performance_schema.threads where name like 'Thread/%' limit 1; -select * from performance_schema.THREADS +select * from performance_schema.threads where name='FOO'; --error ER_TABLEACCESS_DENIED_ERROR @@ -40,7 +40,7 @@ update performance_schema.threads update performance_schema.threads set instrumented= 'NO' where PROCESSLIST_ID=connection_id(); -select instrumented from performance_schema.THREADS +select instrumented from performance_schema.threads where PROCESSLIST_ID=connection_id(); update performance_schema.threads === modified file 'mysql-test/suite/perfschema/t/func_file_io.test' --- a/mysql-test/suite/perfschema/t/func_file_io.test 2010-11-09 08:16:50 +0000 +++ b/mysql-test/suite/perfschema/t/func_file_io.test 2010-11-09 14:34:29 +0000 @@ -27,7 +27,7 @@ UPDATE performance_schema.setup_instrume UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/io/file/%'; -update performance_schema.THREADS SET instrumented = 'YES' +update performance_schema.threads SET instrumented = 'YES' WHERE PROCESSLIST_ID=connection_id(); --disable_warnings === modified file 'mysql-test/suite/perfschema/t/setup_actors.test' --- a/mysql-test/suite/perfschema/t/setup_actors.test 2010-11-09 08:16:50 +0000 +++ b/mysql-test/suite/perfschema/t/setup_actors.test 2010-11-09 14:34:29 +0000 @@ -13,8 +13,8 @@ # along with this program; if not, write to the Free Software Foundation, # 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA -# Check the impact of different entries in performance_schema.SETUP_ACTORS -# on when and how activity of users is recordeed in performance_schema.THREADS. +# Check the impact of different entries in performance_schema.setup_actors +# on when and how activity of users is recordeed in performance_schema.threads. # The checks for indirect activity caused by users, system threads etc. # are within setup_actors1.test. @@ -23,29 +23,29 @@ --source include/have_perfschema.inc # The initial number of rows is 1. The initial row always looks like this: -# mysql> select * from performance_schema.SETUP_ACTORS; +# mysql> select * from performance_schema.setup_actors; # +------+------+------+ # | Host | User | ROLE | # +------+------+------+ # | % | % | % | # +------+------+------+ -select * from performance_schema.SETUP_ACTORS; +select * from performance_schema.setup_actors; -truncate table performance_schema.SETUP_ACTORS; +truncate table performance_schema.setup_actors; -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('hosta', 'user1', '%'); -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('%', 'user2', '%'); -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('localhost', 'user3', '%'); -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('hostb', '%', '%'); -select * from performance_schema.SETUP_ACTORS +select * from performance_schema.setup_actors order by USER, HOST, ROLE; grant ALL on *.* to user1@localhost; @@ -59,25 +59,25 @@ flush privileges; --echo # Switch to (con1, localhost, user1, , ) connect (con1, localhost, user1, , ); -# INSTRUMENTED must be NO because there is no match in performance_schema.SETUP_ACTORS +# INSTRUMENTED must be NO because there is no match in performance_schema.setup_actors select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID = connection_id(); -let $con1_thread_id= `select THREAD_ID from performance_schema.THREADS +let $con1_thread_id= `select THREAD_ID from performance_schema.threads where PROCESSLIST_ID = connection_id()`; --echo # Switch to connection default --connection default -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('%', 'user1', '%'); --echo # Switch to connection con1 --connection con1 -# INSTRUMENTED must be NO because there was no match in performance_schema.SETUP_ACTORS -# when our current session made its connect. Later changes in SETUP_ACTORS have no +# INSTRUMENTED must be NO because there was no match in performance_schema.setup_actors +# when our current session made its connect. Later changes in setup_actors have no # impact. select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID = connection_id(); --echo # Disconnect con1 @@ -87,11 +87,11 @@ where PROCESSLIST_ID = connection_id(); connect (con2, localhost, user2, , ); # INSTRUMENTED must be YES because there is a match via -# (HOST,USER,ROLE) = ('%', 'user2', '%') in performance_schema.SETUP_ACTORS. +# (HOST,USER,ROLE) = ('%', 'user2', '%') in performance_schema.setup_actors. select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID=connection_id(); -let $con2_thread_id= `select THREAD_ID from performance_schema.THREADS +let $con2_thread_id= `select THREAD_ID from performance_schema.threads where PROCESSLIST_ID = connection_id()`; --echo # Disconnect con2 @@ -116,9 +116,9 @@ lock table test.t1 write; connect (con3, localhost, user3, , ); # INSTRUMENTED must be YES because there is a match via -# (HOST,USER,ROLE) = ('localhost', 'user3', '%') in performance_schema.SETUP_ACTORS. +# (HOST,USER,ROLE) = ('localhost', 'user3', '%') in performance_schema.setup_actors. select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID = connection_id(); # PROCESSLIST_ columns are: @@ -126,10 +126,10 @@ where PROCESSLIST_ID = connection_id(); # run a select on INFORMATION_SCHEMA.PROCESSLIST for the corresponding thread. # Check at least once that this is fulfilled. # Note(mleich): -# A join between INFORMATION_SCHEMA.PROCESSLIST and performance_schema.THREADS +# A join between INFORMATION_SCHEMA.PROCESSLIST and performance_schema.threads # Example: # select count(*) = 1 -# from performance_schema.THREADS T inner join information_schema.PROCESSLIST P +# from performance_schema.threads T inner join information_schema.PROCESSLIST P # on T.PROCESSLIST_ID = P.ID and T.PROCESSLIST_USER = P.USER and # T.PROCESSLIST_HOST = P.HOST and T.PROCESSLIST_DB = P.DB and # T.PROCESSLIST_COMMAND = P.COMMAND and T.PROCESSLIST_INFO = P.INFO @@ -157,7 +157,7 @@ let $wait_condition= select count(*) fro --source include/wait_condition.inc # Expect to get 1 now select count(*) = 1 -from performance_schema.THREADS T inner join information_schema.PROCESSLIST P +from performance_schema.threads T inner join information_schema.PROCESSLIST P on T.PROCESSLIST_ID = P.ID and T.PROCESSLIST_USER = P.USER and T.PROCESSLIST_HOST = P.HOST and T.PROCESSLIST_DB = P.DB and T.PROCESSLIST_COMMAND = P.COMMAND and T.PROCESSLIST_INFO = P.INFO @@ -178,9 +178,9 @@ drop table test.t1; --echo # Switch to connection con4 --connection con4 -# INSTRUMENTED must be NO because there is no match in performance_schema.SETUP_ACTORS +# INSTRUMENTED must be NO because there is no match in performance_schema.setup_actors select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID = connection_id(); --echo # Disconnect con4 @@ -189,19 +189,19 @@ where PROCESSLIST_ID = connection_id(); --echo # Switch to connection default --connection default -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('localhost', '%', '%'); -select * from performance_schema.SETUP_ACTORS +select * from performance_schema.setup_actors order by USER, HOST, ROLE; --echo # Switch to (con4b, localhost, user4, , ) connect (con4b, localhost, user4, , ); # INSTRUMENTED must be YES because there is a match via -# (HOST,USER,ROLE) = ('localhost', '%', '%') in performance_schema.SETUP_ACTORS. +# (HOST,USER,ROLE) = ('localhost', '%', '%') in performance_schema.setup_actors. select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID = connection_id(); --echo # Disconnect con4b @@ -209,11 +209,11 @@ where PROCESSLIST_ID = connection_id(); --echo # Switch to connection default --connection default -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('%', 'user5', '%'); create sql security definer view test.v1 as select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST -from performance_schema.THREADS +from performance_schema.threads where PROCESSLIST_ID = connection_id(); --echo # Switch to (con5, localhost, user5, , ) @@ -224,7 +224,7 @@ select * from performance_schema.threads # 1. INSTRUMENTED must be YES because there are two matches # (HOST,USER,ROLE) = ('localhost', '%', '%') # (HOST,USER,ROLE) = ('%', 'user5', '%') -# in performance_schema.SETUP_ACTORS. +# in performance_schema.setup_actors. # But the instrument will only count once which means we must get only one row. # 2. PROCESSLIST_USER refers to USER(), the user who connected, # not the user we might be temporarily acting as (with definer's rights). @@ -252,10 +252,10 @@ drop user user4@localhost; drop user user5@localhost; flush privileges; -truncate table performance_schema.SETUP_ACTORS; +truncate table performance_schema.setup_actors; -insert into performance_schema.SETUP_ACTORS +insert into performance_schema.setup_actors values ('%', '%', '%'); -select * from performance_schema.SETUP_ACTORS; +select * from performance_schema.setup_actors; === modified file 'mysql-test/suite/perfschema/t/start_server_no_setup_actors.test' --- a/mysql-test/suite/perfschema/t/start_server_no_setup_actors.test 2010-07-02 16:36:20 +0000 +++ b/mysql-test/suite/perfschema/t/start_server_no_setup_actors.test 2010-11-09 14:34:29 +0000 @@ -24,5 +24,5 @@ show variables like "performance_schema_setup_actors_size"; # Expect no setup_actors -select count(*) from performance_schema.SETUP_ACTORS; +select count(*) from performance_schema.setup_actors; === modified file 'mysql-test/suite/perfschema/t/threads_innodb.test' --- a/mysql-test/suite/perfschema/t/threads_innodb.test 2010-07-29 18:00:27 +0000 +++ b/mysql-test/suite/perfschema/t/threads_innodb.test 2010-11-09 14:34:29 +0000 @@ -14,9 +14,9 @@ # 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA -# Tests for special content of performance_schema.THREADS +# Tests for special content of performance_schema.threads # -# Show InnoDB related content in performance_schema.THREADS +# Show InnoDB related content in performance_schema.threads --source include/not_embedded.inc --source include/have_innodb.inc @@ -29,7 +29,7 @@ SELECT name, type, processlist_user, processlist_host, processlist_db, processlist_command, processlist_time, processlist_state, processlist_info, parent_thread_id, role, instrumented -FROM performance_schema.THREADS +FROM performance_schema.threads WHERE name LIKE 'thread/innodb/%' GROUP BY name; === modified file 'mysql-test/suite/perfschema/t/threads_insert_delayed.test' --- a/mysql-test/suite/perfschema/t/threads_insert_delayed.test 2010-07-29 18:00:27 +0000 +++ b/mysql-test/suite/perfschema/t/threads_insert_delayed.test 2010-11-09 14:34:29 +0000 @@ -14,7 +14,7 @@ # 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA -# Tests for special content of performance_schema.THREADS +# Tests for special content of performance_schema.threads # # The feature INSERT DELAYED (supported by MyISAM,MEMORY,ARCHIVE,BLACKHOLE) # causes that a "delayed_insert" thread shows up as soon as the first @@ -29,17 +29,17 @@ DROP TEMPORARY TABLE IF EXISTS t2; --enable_warnings CREATE TABLE t1 (f1 BIGINT) ENGINE = MyISAM; CREATE TEMPORARY TABLE t2 AS -SELECT thread_id FROM performance_schema.THREADS WHERE 1 = 2; +SELECT thread_id FROM performance_schema.threads WHERE 1 = 2; # Reveal that the delayed_insert thread does not exist. # Note(mleich): This expectation is probably not all time true. -SELECT COUNT(*) = 0 AS expect_1 FROM performance_schema.THREADS +SELECT COUNT(*) = 0 AS expect_1 FROM performance_schema.threads WHERE name = 'thread/sql/delayed_insert'; INSERT INTO t2 SELECT thread_id -FROM performance_schema.THREADS; +FROM performance_schema.threads; -let $wait_condition= SELECT COUNT(*) = 1 AS expect_0 FROM performance_schema.THREADS +let $wait_condition= SELECT COUNT(*) = 1 AS expect_0 FROM performance_schema.threads WHERE name = 'thread/sql/delayed_insert'; INSERT DELAYED INTO t1 SET f1 = SLEEP(3); --source include/wait_condition.inc @@ -47,7 +47,7 @@ INSERT DELAYED INTO t1 SET f1 = SLEEP(3) # Expect to get # thread/sql/delayed_insert FOREGROUND YES root localhost SELECT name, type, instrumented, processlist_user, processlist_host -FROM performance_schema.THREADS +FROM performance_schema.threads WHERE thread_id NOT IN (SELECT thread_id FROM t2); DROP TABLE t1; === modified file 'mysql-test/suite/perfschema/t/threads_mysql.test' --- a/mysql-test/suite/perfschema/t/threads_mysql.test 2010-09-07 18:33:49 +0000 +++ b/mysql-test/suite/perfschema/t/threads_mysql.test 2010-11-09 14:34:29 +0000 @@ -14,9 +14,9 @@ # 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA -# Tests for special content of performance_schema.THREADS +# Tests for special content of performance_schema.threads # -# Show MySQL server related content in performance_schema.THREADS +# Show MySQL server related content in performance_schema.threads --source include/not_windows.inc --source include/not_embedded.inc @@ -51,13 +51,13 @@ SELECT name, type, processlist_user, pro IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id') AS unified_parent_thread_id, role, instrumented -FROM performance_schema.THREADS +FROM performance_schema.threads WHERE name LIKE 'thread/sql%' ORDER BY name; --enable_ps_protocol CREATE TEMPORARY TABLE t1 AS -SELECT thread_id FROM performance_schema.THREADS +SELECT thread_id FROM performance_schema.threads WHERE name LIKE 'thread/sql%'; @@ -70,14 +70,14 @@ SELECT name, type, processlist_user, pro IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id') AS unified_parent_thread_id, role, instrumented -FROM performance_schema.THREADS +FROM performance_schema.threads WHERE name LIKE 'thread/sql%' AND thread_id NOT IN (SELECT thread_id FROM t1) ORDER BY name; TRUNCATE t1; INSERT INTO t1 -SELECT thread_id FROM performance_schema.THREADS +SELECT thread_id FROM performance_schema.threads WHERE name LIKE 'thread/sql%'; SELECT COUNT(*) INTO @aux FROM t1; @@ -110,7 +110,7 @@ SELECT name, type, processlist_user, pro IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id') AS unified_parent_thread_id, role, instrumented -FROM performance_schema.THREADS +FROM performance_schema.threads WHERE name LIKE 'thread/sql%' AND thread_id NOT IN (SELECT thread_id FROM t1) ORDER BY name; @@ -119,7 +119,7 @@ ORDER BY name; # ------------------------------------------------------ --horizontal_results SELECT t2.name AS parent_thread_name, t1.name AS child_thread_name -FROM performance_schema.THREADS t1 INNER JOIN performance_schema.THREADS t2 +FROM performance_schema.threads t1 INNER JOIN performance_schema.threads t2 ON t1.parent_thread_id = t2.thread_id WHERE t1.name LIKE 'thread/sql%' AND t1.parent_thread_id IS NOT NULL --===============1915983950751350705== 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-bugfixing-\ # merge/ # testament_sha1: 74371fd9469f6a4de51775bf2314842250e2823c # timestamp: 2010-11-09 15:34:39 +0100 # source_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing/ # base_revision_id: tor.didriksen@stripped\ # xqcrwt6lequcvx9u # # Begin bundle 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 cAeNDqDeBlb68FTnfLy6X/4u5IpwoSGbj00+ --===============1915983950751350705==--