diff options
Diffstat (limited to 'mysql-test/suite')
135 files changed, 2101 insertions, 2248 deletions
diff --git a/mysql-test/suite/perfschema/include/binlog_common.inc b/mysql-test/suite/perfschema/include/binlog_common.inc index 10afe54ab5b..96c01d9a4c8 100644 --- a/mysql-test/suite/perfschema/include/binlog_common.inc +++ b/mysql-test/suite/perfschema/include/binlog_common.inc @@ -17,12 +17,12 @@ RESET MASTER; -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO' +update performance_schema.setup_instruments set enabled='NO' where name like "wait/synch/rwlock/%"; -select count(*) > 0 from performance_schema.EVENTS_WAITS_CURRENT; +select count(*) > 0 from performance_schema.events_waits_current; --disable_warnings drop table if exists test.t1; @@ -33,16 +33,16 @@ create table test.t1 (thread_id integer); create table test.t2 (name varchar(128)); insert into test.t1 - select thread_id from performance_schema.EVENTS_WAITS_CURRENT; + select thread_id from performance_schema.events_waits_current; insert into test.t2 - select name from performance_schema.SETUP_INSTRUMENTS + select name from performance_schema.setup_instruments where name like "wait/synch/rwlock/%"; drop table test.t1; drop table test.t2; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_instruments set enabled='YES' where name like "wait/synch/rwlock/%"; --source include/show_binlog_events.inc diff --git a/mysql-test/suite/perfschema/include/cleanup_helper.inc b/mysql-test/suite/perfschema/include/cleanup_helper.inc index 5c2429ddb97..b7e37849f78 100644 --- a/mysql-test/suite/perfschema/include/cleanup_helper.inc +++ b/mysql-test/suite/perfschema/include/cleanup_helper.inc @@ -15,7 +15,7 @@ # Tests for PERFORMANCE_SCHEMA -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; disconnect con1; disconnect con2; diff --git a/mysql-test/suite/perfschema/include/privilege.inc b/mysql-test/suite/perfschema/include/privilege.inc index ef2acc995d5..3973c41b51b 100644 --- a/mysql-test/suite/perfschema/include/privilege.inc +++ b/mysql-test/suite/perfschema/include/privilege.inc @@ -32,48 +32,48 @@ drop table if exists test.t1; ## drop table performance_schema.t1; ## ## --error ER_DBACCESS_DENIED_ERROR -## create table performance_schema.SETUP_INSTRUMENTS(a int); +## create table performance_schema.setup_instruments(a int); ## ## --error ER_DBACCESS_DENIED_ERROR -## create table performance_schema.EVENTS_WAITS_CURRENT(a int); +## create table performance_schema.events_waits_current(a int); ## ## --error ER_DBACCESS_DENIED_ERROR -## create table performance_schema.FILE_INSTANCES(a int); +## create table performance_schema.file_instances(a int); ## ## --error ER_DBACCESS_DENIED_ERROR -## drop table performance_schema.SETUP_INSTRUMENTS; +## drop table performance_schema.setup_instruments; ## ## --error ER_DBACCESS_DENIED_ERROR -## drop table performance_schema.EVENTS_WAITS_CURRENT; +## drop table performance_schema.events_waits_current; ## ## --error ER_DBACCESS_DENIED_ERROR -## drop table performance_schema.FILE_INSTANCES; +## drop table performance_schema.file_instances; --error ER_DBACCESS_DENIED_ERROR -rename table performance_schema.SETUP_INSTRUMENTS to test.t1; +rename table performance_schema.setup_instruments to test.t1; --error ER_DBACCESS_DENIED_ERROR -rename table performance_schema.EVENTS_WAITS_CURRENT to test.t1; +rename table performance_schema.events_waits_current to test.t1; --error ER_DBACCESS_DENIED_ERROR -rename table performance_schema.FILE_INSTANCES to test.t1; +rename table performance_schema.file_instances to test.t1; --error ER_DBACCESS_DENIED_ERROR -rename table performance_schema.SETUP_INSTRUMENTS to performance_schema.t1; +rename table performance_schema.setup_instruments to performance_schema.t1; --error ER_DBACCESS_DENIED_ERROR -rename table performance_schema.EVENTS_WAITS_CURRENT to performance_schema.t1; +rename table performance_schema.events_waits_current to performance_schema.t1; --error ER_DBACCESS_DENIED_ERROR -rename table performance_schema.FILE_INSTANCES to performance_schema.t1; +rename table performance_schema.file_instances to performance_schema.t1; --error ER_DBACCESS_DENIED_ERROR -rename table performance_schema.SETUP_INSTRUMENTS - to performance_schema.EVENTS_WAITS_CURRENT; +rename table performance_schema.setup_instruments + to performance_schema.events_waits_current; --error ER_DBACCESS_DENIED_ERROR -rename table performance_schema.EVENTS_WAITS_CURRENT - to performance_schema.SETUP_INSTRUMENTS; +rename table performance_schema.events_waits_current + to performance_schema.setup_instruments; --error ER_DBACCESS_DENIED_ERROR create procedure performance_schema.my_proc() begin end; @@ -87,108 +87,93 @@ do begin end; --error ER_DBACCESS_DENIED_ERROR create trigger performance_schema.bi_setup_instruments - before insert on performance_schema.SETUP_INSTRUMENTS + before insert on performance_schema.setup_instruments for each row begin end; --error ER_DBACCESS_DENIED_ERROR create trigger performance_schema.bi_events_waits_current - before insert on performance_schema.EVENTS_WAITS_CURRENT + before insert on performance_schema.events_waits_current for each row begin end; --error ER_DBACCESS_DENIED_ERROR create trigger performance_schema.bi_file_instances - before insert on performance_schema.FILE_INSTANCES + before insert on performance_schema.file_instances for each row begin end; --error ER_WRONG_PERFSCHEMA_USAGE create table test.t1(a int) engine=PERFORMANCE_SCHEMA; --error ER_WRONG_PERFSCHEMA_USAGE -create table test.t1 like performance_schema.SETUP_INSTRUMENTS; +create table test.t1 like performance_schema.setup_instruments; --error ER_WRONG_PERFSCHEMA_USAGE -create table test.t1 like performance_schema.EVENTS_WAITS_CURRENT; +create table test.t1 like performance_schema.events_waits_current; --error ER_WRONG_PERFSCHEMA_USAGE -create table test.t1 like performance_schema.FILE_INSTANCES; +create table test.t1 like performance_schema.file_instances; ---replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.SETUP_INSTRUMENTS +insert into performance_schema.setup_instruments set name="foo"; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.EVENTS_WAITS_CURRENT +insert into performance_schema.events_waits_current set name="foo"; ---replace_result '\'file_instances' '\'FILE_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.FILE_INSTANCES +insert into performance_schema.file_instances set name="foo"; ---replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.SETUP_INSTRUMENTS; +delete from performance_schema.setup_instruments; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.EVENTS_WAITS_CURRENT; +delete from performance_schema.events_waits_current; ---replace_result '\'file_instances' '\'FILE_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.FILE_INSTANCES; +delete from performance_schema.file_instances; -lock table performance_schema.SETUP_INSTRUMENTS read; +lock table performance_schema.setup_instruments read; unlock tables; -lock table performance_schema.SETUP_INSTRUMENTS write; +lock table performance_schema.setup_instruments write; unlock tables; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -lock table performance_schema.EVENTS_WAITS_CURRENT read; +lock table performance_schema.events_waits_current read; unlock tables; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -lock table performance_schema.EVENTS_WAITS_CURRENT write; +lock table performance_schema.events_waits_current write; unlock tables; ---replace_result '\'file_instances' '\'FILE_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -lock table performance_schema.FILE_INSTANCES read; +lock table performance_schema.file_instances read; unlock tables; ---replace_result '\'file_instances' '\'FILE_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -lock table performance_schema.FILE_INSTANCES write; +lock table performance_schema.file_instances write; unlock tables; --echo # --echo # WL#4818, NFS2: Can use grants to give normal user access ---echo # to view data from _CURRENT and _HISTORY tables +--echo # to view data from _current and _history tables --echo # --echo # Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3. ---echo # (Except for EVENTS_WAITS_CURRENT, which is granted.) +--echo # (Except for events_waits_current, which is granted.) # Errors here will be caught by the diff afterwards --disable_abort_on_error ---replace_result '\'events_waits_history' '\'EVENTS_WAITS_HISTORY' -SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY LIMIT 1; +SELECT "can select" FROM performance_schema.events_waits_history LIMIT 1; ---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG' -SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY_LONG LIMIT 1; +SELECT "can select" FROM performance_schema.events_waits_history_long LIMIT 1; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' -SELECT "can select" FROM performance_schema.EVENTS_WAITS_CURRENT LIMIT 1; +SELECT "can select" FROM performance_schema.events_waits_current LIMIT 1; ---replace_result '\'events_waits_summary_by_instance' '\'EVENTS_WAITS_SUMMARY_BY_INSTANCE' -SELECT "can select" FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE LIMIT 1; +SELECT "can select" FROM performance_schema.events_waits_summary_by_instance LIMIT 1; ---replace_result '\'file_summary_by_instance' '\'FILE_SUMMARY_BY_INSTANCE' -SELECT "can select" FROM performance_schema.FILE_SUMMARY_BY_INSTANCE LIMIT 1; +SELECT "can select" FROM performance_schema.file_summary_by_instance LIMIT 1; --enable_abort_on_error diff --git a/mysql-test/suite/perfschema/include/setup_helper.inc b/mysql-test/suite/perfschema/include/setup_helper.inc index 195b9cf960a..cdbfd81a24c 100644 --- a/mysql-test/suite/perfschema/include/setup_helper.inc +++ b/mysql-test/suite/perfschema/include/setup_helper.inc @@ -19,23 +19,23 @@ let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_TMPDIR= `select @@tmpdir`; --disable_query_log -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_consumers set enabled='YES'; --enable_query_log connect (con1, localhost, root, , ); -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()`; connect (con2, localhost, root, , ); -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()`; connect (con3, localhost, root, , ); -let $con3_THREAD_ID=`select thread_id from performance_schema.THREADS +let $con3_THREAD_ID=`select thread_id from performance_schema.threads where PROCESSLIST_ID = connection_id()`; connection default; @@ -45,10 +45,10 @@ prepare stmt_dump_events from "select event_name, left(source, locate(\":\", source)) as short_source, operation, number_of_bytes - from performance_schema.EVENTS_WAITS_HISTORY_LONG + from performance_schema.events_waits_history_long where thread_id=? order by event_id;"; prepare stmt_dump_thread from - "select name from performance_schema.THREADS where thread_id=? ;"; + "select name from performance_schema.threads where thread_id=? ;"; --enable_query_log diff --git a/mysql-test/suite/perfschema/include/start_server_common.inc b/mysql-test/suite/perfschema/include/start_server_common.inc index 083b302c5f7..f6e549ea44e 100644 --- a/mysql-test/suite/perfschema/include/start_server_common.inc +++ b/mysql-test/suite/perfschema/include/start_server_common.inc @@ -17,31 +17,31 @@ show databases; -select count(*) from performance_schema.PERFORMANCE_TIMERS; -select count(*) from performance_schema.SETUP_CONSUMERS; -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; -select count(*) from performance_schema.SETUP_TIMERS; +select count(*) from performance_schema.performance_timers; +select count(*) from performance_schema.setup_consumers; +select count(*) > 0 from performance_schema.setup_instruments; +select count(*) from performance_schema.setup_timers; # Make sure we don't crash, no matter what the starting parameters are --disable_result_log -select * from performance_schema.COND_INSTANCES; -select * from performance_schema.EVENTS_WAITS_CURRENT; -select * from performance_schema.EVENTS_WAITS_HISTORY; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -select * from performance_schema.FILE_INSTANCES; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; -select * from performance_schema.MUTEX_INSTANCES; -select * from performance_schema.PERFORMANCE_TIMERS; -select * from performance_schema.RWLOCK_INSTANCES; -select * from performance_schema.SETUP_CONSUMERS; -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_TIMERS; -select * from performance_schema.THREADS; +select * from performance_schema.cond_instances; +select * from performance_schema.events_waits_current; +select * from performance_schema.events_waits_history; +select * from performance_schema.events_waits_history_long; +select * from performance_schema.events_waits_summary_by_instance; +select * from performance_schema.events_waits_summary_by_thread_by_event_name; +select * from performance_schema.events_waits_summary_global_by_event_name; +select * from performance_schema.file_instances; +select * from performance_schema.file_summary_by_event_name; +select * from performance_schema.file_summary_by_instance; +select * from performance_schema.mutex_instances; +select * from performance_schema.performance_timers; +select * from performance_schema.rwlock_instances; +select * from performance_schema.setup_consumers; +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_timers; +select * from performance_schema.threads; --enable_result_log # This has a stable output, printing the result: diff --git a/mysql-test/suite/perfschema/r/aggregate.result b/mysql-test/suite/perfschema/r/aggregate.result index c7ac05ba69d..edc7ce0bcca 100644 --- a/mysql-test/suite/perfschema/r/aggregate.result +++ b/mysql-test/suite/perfschema/r/aggregate.result @@ -1,87 +1,87 @@ "General cleanup" drop table if exists t1; -update performance_schema.SETUP_INSTRUMENTS set enabled = 'NO'; -update performance_schema.SETUP_CONSUMERS set enabled = 'NO'; -truncate table performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -truncate table performance_schema.FILE_SUMMARY_BY_INSTANCE; -truncate table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -truncate table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -truncate table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; -update performance_schema.SETUP_INSTRUMENTS +update performance_schema.setup_instruments set enabled = 'NO'; +update performance_schema.setup_consumers set enabled = 'NO'; +truncate table performance_schema.file_summary_by_event_name; +truncate table performance_schema.file_summary_by_instance; +truncate table performance_schema.events_waits_summary_global_by_event_name; +truncate table performance_schema.events_waits_summary_by_instance; +truncate table performance_schema.events_waits_summary_by_thread_by_event_name; +update performance_schema.setup_consumers set enabled = 'YES'; +update performance_schema.setup_instruments set enabled = 'YES', timed = 'YES'; create table t1 ( id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value') ENGINE=MyISAM; insert into t1 (id) values (1), (2), (3), (4), (5), (6), (7), (8); -update performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO'; -update performance_schema.SETUP_CONSUMERS set enabled = 'NO'; +update performance_schema.setup_instruments SET enabled = 'NO'; +update performance_schema.setup_consumers set enabled = 'NO'; set @dump_all=FALSE; "Verifying file aggregate consistency" SELECT EVENT_NAME, e.COUNT_READ, SUM(i.COUNT_READ) -FROM performance_schema.FILE_SUMMARY_BY_EVENT_NAME AS e -JOIN performance_schema.FILE_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.file_summary_by_event_name AS e +JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.COUNT_READ <> SUM(i.COUNT_READ)) OR @dump_all; EVENT_NAME COUNT_READ SUM(i.COUNT_READ) SELECT EVENT_NAME, e.COUNT_WRITE, SUM(i.COUNT_WRITE) -FROM performance_schema.FILE_SUMMARY_BY_EVENT_NAME AS e -JOIN performance_schema.FILE_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.file_summary_by_event_name AS e +JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE)) OR @dump_all; EVENT_NAME COUNT_WRITE SUM(i.COUNT_WRITE) SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_READ, SUM(i.SUM_NUMBER_OF_BYTES_READ) -FROM performance_schema.FILE_SUMMARY_BY_EVENT_NAME AS e -JOIN performance_schema.FILE_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.file_summary_by_event_name AS e +JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.SUM_NUMBER_OF_BYTES_READ <> SUM(i.SUM_NUMBER_OF_BYTES_READ)) OR @dump_all; EVENT_NAME SUM_NUMBER_OF_BYTES_READ SUM(i.SUM_NUMBER_OF_BYTES_READ) SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_WRITE, SUM(i.SUM_NUMBER_OF_BYTES_WRITE) -FROM performance_schema.FILE_SUMMARY_BY_EVENT_NAME AS e -JOIN performance_schema.FILE_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.file_summary_by_event_name AS e +JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.SUM_NUMBER_OF_BYTES_WRITE <> SUM(i.SUM_NUMBER_OF_BYTES_WRITE)) OR @dump_all; EVENT_NAME SUM_NUMBER_OF_BYTES_WRITE SUM(i.SUM_NUMBER_OF_BYTES_WRITE) "Verifying waits aggregate consistency (instance)" SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(i.SUM_TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e -JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.events_waits_summary_global_by_event_name AS e +JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.SUM_TIMER_WAIT < SUM(i.SUM_TIMER_WAIT)) OR @dump_all; EVENT_NAME SUM_TIMER_WAIT SUM(i.SUM_TIMER_WAIT) SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(i.MIN_TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e -JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.events_waits_summary_global_by_event_name AS e +JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.MIN_TIMER_WAIT > MIN(i.MIN_TIMER_WAIT)) AND (MIN(i.MIN_TIMER_WAIT) != 0) OR @dump_all; EVENT_NAME MIN_TIMER_WAIT MIN(i.MIN_TIMER_WAIT) SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(i.MAX_TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e -JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.events_waits_summary_global_by_event_name AS e +JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.MAX_TIMER_WAIT < MAX(i.MAX_TIMER_WAIT)) OR @dump_all; EVENT_NAME MAX_TIMER_WAIT MAX(i.MAX_TIMER_WAIT) "Verifying waits aggregate consistency (thread)" SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(t.SUM_TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e -JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t +FROM performance_schema.events_waits_summary_global_by_event_name AS e +JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.SUM_TIMER_WAIT < SUM(t.SUM_TIMER_WAIT)) OR @dump_all; EVENT_NAME SUM_TIMER_WAIT SUM(t.SUM_TIMER_WAIT) SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(t.MIN_TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e -JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t +FROM performance_schema.events_waits_summary_global_by_event_name AS e +JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.MIN_TIMER_WAIT > MIN(t.MIN_TIMER_WAIT)) @@ -89,14 +89,14 @@ AND (MIN(t.MIN_TIMER_WAIT) != 0) OR @dump_all; EVENT_NAME MIN_TIMER_WAIT MIN(t.MIN_TIMER_WAIT) SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(t.MAX_TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e -JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t +FROM performance_schema.events_waits_summary_global_by_event_name AS e +JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.MAX_TIMER_WAIT < MAX(t.MAX_TIMER_WAIT)) OR @dump_all; EVENT_NAME MAX_TIMER_WAIT MAX(t.MAX_TIMER_WAIT) -update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; -update performance_schema.SETUP_INSTRUMENTS +update performance_schema.setup_consumers set enabled = 'YES'; +update performance_schema.setup_instruments set enabled = 'YES', timed = 'YES'; drop table test.t1; diff --git a/mysql-test/suite/perfschema/r/binlog_mix.result b/mysql-test/suite/perfschema/r/binlog_mix.result index 1e58179af51..b31b853b06d 100644 --- a/mysql-test/suite/perfschema/r/binlog_mix.result +++ b/mysql-test/suite/perfschema/r/binlog_mix.result @@ -1,11 +1,11 @@ set binlog_format=mixed; RESET MASTER; -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -update performance_schema.SETUP_INSTRUMENTS set enabled='NO' +update performance_schema.setup_instruments set enabled='NO' where name like "wait/synch/rwlock/%"; -select count(*) > 0 from performance_schema.EVENTS_WAITS_CURRENT; +select count(*) > 0 from performance_schema.events_waits_current; count(*) > 0 1 drop table if exists test.t1; @@ -13,18 +13,18 @@ drop table if exists test.t2; create table test.t1 (thread_id integer); create table test.t2 (name varchar(128)); insert into test.t1 -select thread_id from performance_schema.EVENTS_WAITS_CURRENT; +select thread_id from performance_schema.events_waits_current; insert into test.t2 -select name from performance_schema.SETUP_INSTRUMENTS +select name from performance_schema.setup_instruments where name like "wait/synch/rwlock/%"; drop table test.t1; drop table test.t2; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_instruments set enabled='YES' where name like "wait/synch/rwlock/%"; show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (performance_schema.SETUP_INSTRUMENTS) +master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) master-bin.000001 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT @@ -43,7 +43,7 @@ master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (performance_schema.SETUP_INSTRUMENTS) +master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) master-bin.000001 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT diff --git a/mysql-test/suite/perfschema/r/binlog_row.result b/mysql-test/suite/perfschema/r/binlog_row.result index 28803c73a84..010f2de06e6 100644 --- a/mysql-test/suite/perfschema/r/binlog_row.result +++ b/mysql-test/suite/perfschema/r/binlog_row.result @@ -1,11 +1,11 @@ set binlog_format=row; RESET MASTER; -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -update performance_schema.SETUP_INSTRUMENTS set enabled='NO' +update performance_schema.setup_instruments set enabled='NO' where name like "wait/synch/rwlock/%"; -select count(*) > 0 from performance_schema.EVENTS_WAITS_CURRENT; +select count(*) > 0 from performance_schema.events_waits_current; count(*) > 0 1 drop table if exists test.t1; @@ -13,18 +13,18 @@ drop table if exists test.t2; create table test.t1 (thread_id integer); create table test.t2 (name varchar(128)); insert into test.t1 -select thread_id from performance_schema.EVENTS_WAITS_CURRENT; +select thread_id from performance_schema.events_waits_current; insert into test.t2 -select name from performance_schema.SETUP_INSTRUMENTS +select name from performance_schema.setup_instruments where name like "wait/synch/rwlock/%"; drop table test.t1; drop table test.t2; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_instruments set enabled='YES' where name like "wait/synch/rwlock/%"; show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (performance_schema.SETUP_INSTRUMENTS) +master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) master-bin.000001 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT @@ -43,7 +43,7 @@ master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (performance_schema.SETUP_INSTRUMENTS) +master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments) master-bin.000001 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT diff --git a/mysql-test/suite/perfschema/r/binlog_stmt.result b/mysql-test/suite/perfschema/r/binlog_stmt.result index 288eba4d3d6..60054ee8a74 100644 --- a/mysql-test/suite/perfschema/r/binlog_stmt.result +++ b/mysql-test/suite/perfschema/r/binlog_stmt.result @@ -1,14 +1,14 @@ set binlog_format=statement; call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); RESET MASTER; -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -update performance_schema.SETUP_INSTRUMENTS set enabled='NO' +update performance_schema.setup_instruments set enabled='NO' where name like "wait/synch/rwlock/%"; Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. -select count(*) > 0 from performance_schema.EVENTS_WAITS_CURRENT; +select count(*) > 0 from performance_schema.events_waits_current; count(*) > 0 1 drop table if exists test.t1; @@ -16,24 +16,24 @@ drop table if exists test.t2; create table test.t1 (thread_id integer); create table test.t2 (name varchar(128)); insert into test.t1 -select thread_id from performance_schema.EVENTS_WAITS_CURRENT; +select thread_id from performance_schema.events_waits_current; Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. insert into test.t2 -select name from performance_schema.SETUP_INSTRUMENTS +select name from performance_schema.setup_instruments where name like "wait/synch/rwlock/%"; Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. drop table test.t1; drop table test.t2; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_instruments set enabled='YES' where name like "wait/synch/rwlock/%"; Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN -master-bin.000001 # Query # # use `test`; update performance_schema.SETUP_INSTRUMENTS set enabled='NO' +master-bin.000001 # Query # # use `test`; update performance_schema.setup_instruments set enabled='NO' where name like "wait/synch/rwlock/%" master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ @@ -42,16 +42,16 @@ master-bin.000001 # Query # # use `test`; create table test.t1 (thread_id intege master-bin.000001 # Query # # use `test`; create table test.t2 (name varchar(128)) master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into test.t1 -select thread_id from performance_schema.EVENTS_WAITS_CURRENT +select thread_id from performance_schema.events_waits_current master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into test.t2 -select name from performance_schema.SETUP_INSTRUMENTS +select name from performance_schema.setup_instruments where name like "wait/synch/rwlock/%" master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # BEGIN -master-bin.000001 # Query # # use `test`; update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +master-bin.000001 # Query # # use `test`; update performance_schema.setup_instruments set enabled='YES' where name like "wait/synch/rwlock/%" master-bin.000001 # Query # # COMMIT diff --git a/mysql-test/suite/perfschema/r/checksum.result b/mysql-test/suite/perfschema/r/checksum.result index 323cb303dae..587dead845a 100644 --- a/mysql-test/suite/perfschema/r/checksum.result +++ b/mysql-test/suite/perfschema/r/checksum.result @@ -1,34 +1,34 @@ -checksum table performance_schema.COND_INSTANCES; -checksum table performance_schema.EVENTS_WAITS_CURRENT; -checksum table performance_schema.EVENTS_WAITS_HISTORY; -checksum table performance_schema.EVENTS_WAITS_HISTORY_LONG; -checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -checksum table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -checksum table performance_schema.FILE_INSTANCES; -checksum table performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -checksum table performance_schema.FILE_SUMMARY_BY_INSTANCE; -checksum table performance_schema.MUTEX_INSTANCES; -checksum table performance_schema.PERFORMANCE_TIMERS; -checksum table performance_schema.RWLOCK_INSTANCES; -checksum table performance_schema.SETUP_CONSUMERS; -checksum table performance_schema.SETUP_INSTRUMENTS; -checksum table performance_schema.SETUP_TIMERS; -checksum table performance_schema.THREADS; -checksum table performance_schema.COND_INSTANCES extended; -checksum table performance_schema.EVENTS_WAITS_CURRENT extended; -checksum table performance_schema.EVENTS_WAITS_HISTORY extended; -checksum table performance_schema.EVENTS_WAITS_HISTORY_LONG extended; -checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE extended; -checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME extended; -checksum table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME extended; -checksum table performance_schema.FILE_INSTANCES extended; -checksum table performance_schema.FILE_SUMMARY_BY_EVENT_NAME extended; -checksum table performance_schema.FILE_SUMMARY_BY_INSTANCE extended; -checksum table performance_schema.MUTEX_INSTANCES extended; -checksum table performance_schema.PERFORMANCE_TIMERS extended; -checksum table performance_schema.RWLOCK_INSTANCES extended; -checksum table performance_schema.SETUP_CONSUMERS extended; -checksum table performance_schema.SETUP_INSTRUMENTS extended; -checksum table performance_schema.SETUP_TIMERS extended; -checksum table performance_schema.THREADS extended; +checksum table performance_schema.cond_instances; +checksum table performance_schema.events_waits_current; +checksum table performance_schema.events_waits_history; +checksum table performance_schema.events_waits_history_long; +checksum table performance_schema.events_waits_summary_by_instance; +checksum table performance_schema.events_waits_summary_by_thread_by_event_name; +checksum table performance_schema.events_waits_summary_global_by_event_name; +checksum table performance_schema.file_instances; +checksum table performance_schema.file_summary_by_event_name; +checksum table performance_schema.file_summary_by_instance; +checksum table performance_schema.mutex_instances; +checksum table performance_schema.performance_timers; +checksum table performance_schema.rwlock_instances; +checksum table performance_schema.setup_consumers; +checksum table performance_schema.setup_instruments; +checksum table performance_schema.setup_timers; +checksum table performance_schema.threads; +checksum table performance_schema.cond_instances extended; +checksum table performance_schema.events_waits_current extended; +checksum table performance_schema.events_waits_history extended; +checksum table performance_schema.events_waits_history_long extended; +checksum table performance_schema.events_waits_summary_by_instance extended; +checksum table performance_schema.events_waits_summary_by_thread_by_event_name extended; +checksum table performance_schema.events_waits_summary_global_by_event_name extended; +checksum table performance_schema.file_instances extended; +checksum table performance_schema.file_summary_by_event_name extended; +checksum table performance_schema.file_summary_by_instance extended; +checksum table performance_schema.mutex_instances extended; +checksum table performance_schema.performance_timers extended; +checksum table performance_schema.rwlock_instances extended; +checksum table performance_schema.setup_consumers extended; +checksum table performance_schema.setup_instruments extended; +checksum table performance_schema.setup_timers extended; +checksum table performance_schema.threads extended; diff --git a/mysql-test/suite/perfschema/r/column_privilege.result b/mysql-test/suite/perfschema/r/column_privilege.result index ac6030690dd..aff5f3e6eee 100644 --- a/mysql-test/suite/perfschema/r/column_privilege.result +++ b/mysql-test/suite/perfschema/r/column_privilege.result @@ -3,26 +3,26 @@ Grants for root@localhost GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION grant usage on *.* to 'pfs_user_5'@localhost with GRANT OPTION; -grant SELECT(thread_id, event_id) on performance_schema.EVENTS_WAITS_CURRENT +grant SELECT(thread_id, event_id) on performance_schema.events_waits_current to 'pfs_user_5'@localhost; -grant UPDATE(enabled) on performance_schema.SETUP_INSTRUMENTS +grant UPDATE(enabled) on performance_schema.setup_instruments to 'pfs_user_5'@localhost; flush privileges; -select thread_id from performance_schema.EVENTS_WAITS_CURRENT; -select thread_id, event_id from performance_schema.EVENTS_WAITS_CURRENT; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -select event_name from performance_schema.EVENTS_WAITS_CURRENT; -ERROR 42000: SELECT command denied to user 'pfs_user_5'@'localhost' for column 'event_name' in table 'EVENTS_WAITS_CURRENT' +select thread_id from performance_schema.events_waits_current; +select thread_id, event_id from performance_schema.events_waits_current; +update performance_schema.setup_instruments set enabled='YES'; +select event_name from performance_schema.events_waits_current; +ERROR 42000: SELECT command denied to user 'pfs_user_5'@'localhost' for column 'event_name' in table 'events_waits_current' select thread_id, event_id, event_name -from performance_schema.EVENTS_WAITS_CURRENT; -ERROR 42000: SELECT command denied to user 'pfs_user_5'@'localhost' for column 'event_name' in table 'EVENTS_WAITS_CURRENT' -update performance_schema.SETUP_INSTRUMENTS set name='illegal'; -ERROR 42000: UPDATE command denied to user 'pfs_user_5'@'localhost' for column 'name' in table 'SETUP_INSTRUMENTS' -update performance_schema.SETUP_INSTRUMENTS set timed='NO'; -ERROR 42000: UPDATE command denied to user 'pfs_user_5'@'localhost' for column 'timed' in table 'SETUP_INSTRUMENTS' +from performance_schema.events_waits_current; +ERROR 42000: SELECT command denied to user 'pfs_user_5'@'localhost' for column 'event_name' in table 'events_waits_current' +update performance_schema.setup_instruments set name='illegal'; +ERROR 42000: UPDATE command denied to user 'pfs_user_5'@'localhost' for column 'name' in table 'setup_instruments' +update performance_schema.setup_instruments set timed='NO'; +ERROR 42000: UPDATE command denied to user 'pfs_user_5'@'localhost' for column 'timed' in table 'setup_instruments' REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'pfs_user_5'@localhost; DROP USER 'pfs_user_5'@localhost; flush privileges; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES'; -UPDATE performance_schema.SETUP_CONSUMERS SET enabled = 'YES'; -UPDATE performance_schema.SETUP_TIMERS SET timer_name = 'CYCLE'; +UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; +UPDATE performance_schema.setup_consumers SET enabled = 'YES'; +UPDATE performance_schema.setup_timers SET timer_name = 'CYCLE'; diff --git a/mysql-test/suite/perfschema/r/ddl_cond_instances.result b/mysql-test/suite/perfschema/r/ddl_cond_instances.result index 33adcebaceb..6b8b40af463 100644 --- a/mysql-test/suite/perfschema/r/ddl_cond_instances.result +++ b/mysql-test/suite/perfschema/r/ddl_cond_instances.result @@ -1,8 +1,8 @@ -alter table performance_schema.COND_INSTANCES add column foo integer; +alter table performance_schema.cond_instances add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.COND_INSTANCES; +truncate table performance_schema.cond_instances; ERROR HY000: Invalid performance_schema usage. -ALTER TABLE performance_schema.COND_INSTANCES ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.cond_instances ADD INDEX test_index(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.COND_INSTANCES(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.cond_instances(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_events_waits_current.result b/mysql-test/suite/perfschema/r/ddl_events_waits_current.result index a438c93affe..545134e5bd0 100644 --- a/mysql-test/suite/perfschema/r/ddl_events_waits_current.result +++ b/mysql-test/suite/perfschema/r/ddl_events_waits_current.result @@ -1,7 +1,7 @@ -alter table performance_schema.EVENTS_WAITS_CURRENT add column foo integer; +alter table performance_schema.events_waits_current add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.EVENTS_WAITS_CURRENT; -ALTER TABLE performance_schema.EVENTS_WAITS_CURRENT ADD INDEX test_index(EVENT_ID); +truncate table performance_schema.events_waits_current; +ALTER TABLE performance_schema.events_waits_current ADD INDEX test_index(EVENT_ID); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_CURRENT(EVENT_ID); +CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_current(EVENT_ID); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_events_waits_history.result b/mysql-test/suite/perfschema/r/ddl_events_waits_history.result index 748dc2f29cd..2907e865b37 100644 --- a/mysql-test/suite/perfschema/r/ddl_events_waits_history.result +++ b/mysql-test/suite/perfschema/r/ddl_events_waits_history.result @@ -1,7 +1,7 @@ -alter table performance_schema.EVENTS_WAITS_HISTORY add column foo integer; +alter table performance_schema.events_waits_history add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.EVENTS_WAITS_HISTORY; -ALTER TABLE performance_schema.EVENTS_WAITS_HISTORY ADD INDEX test_index(EVENT_ID); +truncate table performance_schema.events_waits_history; +ALTER TABLE performance_schema.events_waits_history ADD INDEX test_index(EVENT_ID); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_HISTORY(EVENT_ID); +CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_history(EVENT_ID); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result b/mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result index 1a047a765f6..8926d39374b 100644 --- a/mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result +++ b/mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result @@ -1,7 +1,7 @@ -alter table performance_schema.EVENTS_WAITS_HISTORY_LONG add column foo integer; +alter table performance_schema.events_waits_history_long add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -ALTER TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG ADD INDEX test_index(EVENT_ID); +truncate table performance_schema.events_waits_history_long; +ALTER TABLE performance_schema.events_waits_history_long ADD INDEX test_index(EVENT_ID); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_HISTORY_LONG(EVENT_ID); +CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_history_long(EVENT_ID); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_ews_by_instance.result b/mysql-test/suite/perfschema/r/ddl_ews_by_instance.result index 4a35565bae0..94168f16eb7 100644 --- a/mysql-test/suite/perfschema/r/ddl_ews_by_instance.result +++ b/mysql-test/suite/perfschema/r/ddl_ews_by_instance.result @@ -1,7 +1,7 @@ -alter table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE add column foo integer; +alter table performance_schema.events_waits_summary_by_instance add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -ALTER TABLE performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE ADD INDEX test_index(EVENT_NAME); +truncate table performance_schema.events_waits_summary_by_instance; +ALTER TABLE performance_schema.events_waits_summary_by_instance ADD INDEX test_index(EVENT_NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE(EVENT_NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_summary_by_instance(EVENT_NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result index 18d98006220..1694ff9287d 100644 --- a/mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result +++ b/mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result @@ -1,9 +1,9 @@ -alter table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +alter table performance_schema.events_waits_summary_by_thread_by_event_name add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -ALTER TABLE performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME ADD INDEX test_index(THREAD_ID); +truncate table performance_schema.events_waits_summary_by_thread_by_event_name; +ALTER TABLE performance_schema.events_waits_summary_by_thread_by_event_name ADD INDEX test_index(THREAD_ID); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' CREATE UNIQUE INDEX test_index -ON performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME(THREAD_ID); +ON performance_schema.events_waits_summary_by_thread_by_event_name(THREAD_ID); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result b/mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result index 4f3ebcaea43..3b8cf851f80 100644 --- a/mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result +++ b/mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result @@ -1,10 +1,10 @@ -alter table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +alter table performance_schema.events_waits_summary_global_by_event_name add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -ALTER TABLE performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +truncate table performance_schema.events_waits_summary_global_by_event_name; +ALTER TABLE performance_schema.events_waits_summary_global_by_event_name ADD INDEX test_index(EVENT_NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' CREATE UNIQUE INDEX test_index -ON performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME(EVENT_NAME); +ON performance_schema.events_waits_summary_global_by_event_name(EVENT_NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_file_instances.result b/mysql-test/suite/perfschema/r/ddl_file_instances.result index 21e65c62405..338a0260326 100644 --- a/mysql-test/suite/perfschema/r/ddl_file_instances.result +++ b/mysql-test/suite/perfschema/r/ddl_file_instances.result @@ -1,8 +1,8 @@ -alter table performance_schema.FILE_INSTANCES add column foo integer; +alter table performance_schema.file_instances add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.FILE_INSTANCES; +truncate table performance_schema.file_instances; ERROR HY000: Invalid performance_schema usage. -ALTER TABLE performance_schema.FILE_INSTANCES ADD INDEX test_index(FILE_NAME); +ALTER TABLE performance_schema.file_instances ADD INDEX test_index(FILE_NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.FILE_INSTANCES(FILE_NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.file_instances(FILE_NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result b/mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result index 2f21ef56832..11bff4104bb 100644 --- a/mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result +++ b/mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result @@ -1,7 +1,7 @@ -alter table performance_schema.FILE_SUMMARY_BY_EVENT_NAME add column foo integer; +alter table performance_schema.file_summary_by_event_name add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -ALTER TABLE performance_schema.FILE_SUMMARY_BY_EVENT_NAME ADD INDEX test_index(NAME); +truncate table performance_schema.file_summary_by_event_name; +ALTER TABLE performance_schema.file_summary_by_event_name ADD INDEX test_index(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.FILE_SUMMARY_BY_EVENT_NAME(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.file_summary_by_event_name(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_fs_by_instance.result b/mysql-test/suite/perfschema/r/ddl_fs_by_instance.result index 8e256d1fd8d..b28847b3aca 100644 --- a/mysql-test/suite/perfschema/r/ddl_fs_by_instance.result +++ b/mysql-test/suite/perfschema/r/ddl_fs_by_instance.result @@ -1,7 +1,7 @@ -alter table performance_schema.FILE_SUMMARY_BY_INSTANCE add column foo integer; +alter table performance_schema.file_summary_by_instance add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.FILE_SUMMARY_BY_INSTANCE; -ALTER TABLE performance_schema.FILE_SUMMARY_BY_INSTANCE ADD INDEX test_index(NAME); +truncate table performance_schema.file_summary_by_instance; +ALTER TABLE performance_schema.file_summary_by_instance ADD INDEX test_index(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.FILE_SUMMARY_BY_INSTANCE(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.file_summary_by_instance(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_mutex_instances.result b/mysql-test/suite/perfschema/r/ddl_mutex_instances.result index 35397a5294d..0e35b0d766a 100644 --- a/mysql-test/suite/perfschema/r/ddl_mutex_instances.result +++ b/mysql-test/suite/perfschema/r/ddl_mutex_instances.result @@ -1,8 +1,8 @@ -alter table performance_schema.MUTEX_INSTANCES add column foo integer; +alter table performance_schema.mutex_instances add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.MUTEX_INSTANCES; +truncate table performance_schema.mutex_instances; ERROR HY000: Invalid performance_schema usage. -ALTER TABLE performance_schema.MUTEX_INSTANCES ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.mutex_instances ADD INDEX test_index(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.MUTEX_INSTANCES(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.mutex_instances(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_performance_timers.result b/mysql-test/suite/perfschema/r/ddl_performance_timers.result index 5de8193b205..6868d419f1b 100644 --- a/mysql-test/suite/perfschema/r/ddl_performance_timers.result +++ b/mysql-test/suite/perfschema/r/ddl_performance_timers.result @@ -1,8 +1,8 @@ -alter table performance_schema.PERFORMANCE_TIMERS add column foo integer; +alter table performance_schema.performance_timers add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.PERFORMANCE_TIMERS; +truncate table performance_schema.performance_timers; ERROR HY000: Invalid performance_schema usage. -ALTER TABLE performance_schema.PERFORMANCE_TIMERS ADD INDEX test_index(TIMER_NAME); +ALTER TABLE performance_schema.performance_timers ADD INDEX test_index(TIMER_NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.PERFORMANCE_TIMERS(TIMER_NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.performance_timers(TIMER_NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_rwlock_instances.result b/mysql-test/suite/perfschema/r/ddl_rwlock_instances.result index 849d191b17f..e93aef47a5c 100644 --- a/mysql-test/suite/perfschema/r/ddl_rwlock_instances.result +++ b/mysql-test/suite/perfschema/r/ddl_rwlock_instances.result @@ -1,8 +1,8 @@ -alter table performance_schema.RWLOCK_INSTANCES add column foo integer; +alter table performance_schema.rwlock_instances add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.RWLOCK_INSTANCES; +truncate table performance_schema.rwlock_instances; ERROR HY000: Invalid performance_schema usage. -ALTER TABLE performance_schema.RWLOCK_INSTANCES ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.rwlock_instances ADD INDEX test_index(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.RWLOCK_INSTANCES(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.rwlock_instances(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_setup_consumers.result b/mysql-test/suite/perfschema/r/ddl_setup_consumers.result index f141725ee1f..1b121a0ec4c 100644 --- a/mysql-test/suite/perfschema/r/ddl_setup_consumers.result +++ b/mysql-test/suite/perfschema/r/ddl_setup_consumers.result @@ -1,8 +1,8 @@ -alter table performance_schema.SETUP_CONSUMERS add column foo integer; +alter table performance_schema.setup_consumers add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.SETUP_CONSUMERS; +truncate table performance_schema.setup_consumers; ERROR HY000: Invalid performance_schema usage. -ALTER TABLE performance_schema.SETUP_CONSUMERS ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.setup_consumers ADD INDEX test_index(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.SETUP_CONSUMERS(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.setup_consumers(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_setup_instruments.result b/mysql-test/suite/perfschema/r/ddl_setup_instruments.result index 42e54b587d8..f67b4f5791b 100644 --- a/mysql-test/suite/perfschema/r/ddl_setup_instruments.result +++ b/mysql-test/suite/perfschema/r/ddl_setup_instruments.result @@ -1,8 +1,8 @@ -alter table performance_schema.SETUP_INSTRUMENTS add column foo integer; +alter table performance_schema.setup_instruments add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.SETUP_INSTRUMENTS; +truncate table performance_schema.setup_instruments; ERROR HY000: Invalid performance_schema usage. -ALTER TABLE performance_schema.SETUP_INSTRUMENTS ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.setup_instruments ADD INDEX test_index(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.SETUP_INSTRUMENTS(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.setup_instruments(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_setup_timers.result b/mysql-test/suite/perfschema/r/ddl_setup_timers.result index fc74730bd50..69b3d36cc1b 100644 --- a/mysql-test/suite/perfschema/r/ddl_setup_timers.result +++ b/mysql-test/suite/perfschema/r/ddl_setup_timers.result @@ -1,8 +1,8 @@ -alter table performance_schema.SETUP_TIMERS add column foo integer; +alter table performance_schema.setup_timers add column foo integer; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -truncate table performance_schema.SETUP_TIMERS; +truncate table performance_schema.setup_timers; ERROR HY000: Invalid performance_schema usage. -ALTER TABLE performance_schema.SETUP_TIMERS ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.setup_timers ADD INDEX test_index(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.SETUP_TIMERS(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.setup_timers(NAME); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/ddl_threads.result b/mysql-test/suite/perfschema/r/ddl_threads.result index 5d4b54d8bbe..9d949e0920f 100644 --- a/mysql-test/suite/perfschema/r/ddl_threads.result +++ b/mysql-test/suite/perfschema/r/ddl_threads.result @@ -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(ID); +ALTER TABLE performance_schema.threads ADD INDEX test_index(ID); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -CREATE UNIQUE INDEX test_index ON performance_schema.THREADS(ID); +CREATE UNIQUE INDEX test_index ON performance_schema.threads(ID); ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' diff --git a/mysql-test/suite/perfschema/r/dml_cond_instances.result b/mysql-test/suite/perfschema/r/dml_cond_instances.result index 8adc632b91b..922effc59ae 100644 --- a/mysql-test/suite/perfschema/r/dml_cond_instances.result +++ b/mysql-test/suite/perfschema/r/dml_cond_instances.result @@ -1,23 +1,23 @@ -select * from performance_schema.COND_INSTANCES limit 1; +select * from performance_schema.cond_instances limit 1; NAME OBJECT_INSTANCE_BEGIN # # -select * from performance_schema.COND_INSTANCES +select * from performance_schema.cond_instances where name='FOO'; NAME OBJECT_INSTANCE_BEGIN -insert into performance_schema.COND_INSTANCES +insert into performance_schema.cond_instances set name='FOO', object_instance_begin=12; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'COND_INSTANCES' -update performance_schema.COND_INSTANCES +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'cond_instances' +update performance_schema.cond_instances set name='FOO'; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'COND_INSTANCES' -delete from performance_schema.COND_INSTANCES +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'cond_instances' +delete from performance_schema.cond_instances where name like "wait/%"; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'COND_INSTANCES' -delete from performance_schema.COND_INSTANCES; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'COND_INSTANCES' -LOCK TABLES performance_schema.COND_INSTANCES READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'COND_INSTANCES' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'cond_instances' +delete from performance_schema.cond_instances; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'cond_instances' +LOCK TABLES performance_schema.cond_instances READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'cond_instances' UNLOCK TABLES; -LOCK TABLES performance_schema.COND_INSTANCES WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'COND_INSTANCES' +LOCK TABLES performance_schema.cond_instances WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'cond_instances' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_events_waits_current.result b/mysql-test/suite/perfschema/r/dml_events_waits_current.result index 5cd0dba7ad1..9b0bcf7f876 100644 --- a/mysql-test/suite/perfschema/r/dml_events_waits_current.result +++ b/mysql-test/suite/perfschema/r/dml_events_waits_current.result @@ -1,28 +1,28 @@ -select * from performance_schema.EVENTS_WAITS_CURRENT +select * from performance_schema.events_waits_current where event_name like 'Wait/Synch/%' limit 1; THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS # # # # # # # # NULL NULL NULL # NULL # NULL 0 -select * from performance_schema.EVENTS_WAITS_CURRENT +select * from performance_schema.events_waits_current where event_name='FOO'; THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS -insert into performance_schema.EVENTS_WAITS_CURRENT +insert into performance_schema.events_waits_current set thread_id='1', event_id=1, event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' -update performance_schema.EVENTS_WAITS_CURRENT +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_current' +update performance_schema.events_waits_current set timer_start=12; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' -update performance_schema.EVENTS_WAITS_CURRENT +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_current' +update performance_schema.events_waits_current set timer_start=12 where thread_id=0; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' -delete from performance_schema.EVENTS_WAITS_CURRENT +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_current' +delete from performance_schema.events_waits_current where thread_id=1; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' -delete from performance_schema.EVENTS_WAITS_CURRENT; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' -LOCK TABLES performance_schema.EVENTS_WAITS_CURRENT READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_current' +delete from performance_schema.events_waits_current; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_current' +LOCK TABLES performance_schema.events_waits_current READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current' UNLOCK TABLES; -LOCK TABLES performance_schema.EVENTS_WAITS_CURRENT WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' +LOCK TABLES performance_schema.events_waits_current WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_events_waits_history.result b/mysql-test/suite/perfschema/r/dml_events_waits_history.result index 953922868fb..5fc95584c7f 100644 --- a/mysql-test/suite/perfschema/r/dml_events_waits_history.result +++ b/mysql-test/suite/perfschema/r/dml_events_waits_history.result @@ -1,36 +1,36 @@ -select * from performance_schema.EVENTS_WAITS_HISTORY +select * from performance_schema.events_waits_history where event_name like 'Wait/Synch/%' limit 1; THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS # # # # # # # # NULL NULL NULL # NULL # NULL 0 -select * from performance_schema.EVENTS_WAITS_HISTORY +select * from performance_schema.events_waits_history where event_name='FOO'; THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS -select * from performance_schema.EVENTS_WAITS_HISTORY +select * from performance_schema.events_waits_history where event_name like 'Wait/Synch/%' order by timer_wait limit 1; THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS # # # # # # # # NULL NULL NULL # NULL # NULL 0 -select * from performance_schema.EVENTS_WAITS_HISTORY +select * from performance_schema.events_waits_history where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1; THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS # # # # # # # # NULL NULL NULL # NULL # NULL 0 -insert into performance_schema.EVENTS_WAITS_HISTORY +insert into performance_schema.events_waits_history set thread_id='1', event_id=1, event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' -update performance_schema.EVENTS_WAITS_HISTORY +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_history' +update performance_schema.events_waits_history set timer_start=12; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' -update performance_schema.EVENTS_WAITS_HISTORY +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history' +update performance_schema.events_waits_history set timer_start=12 where thread_id=0; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' -delete from performance_schema.EVENTS_WAITS_HISTORY +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history' +delete from performance_schema.events_waits_history where thread_id=1; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' -delete from performance_schema.EVENTS_WAITS_HISTORY; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' -LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history' +delete from performance_schema.events_waits_history; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history' +LOCK TABLES performance_schema.events_waits_history READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_history' UNLOCK TABLES; -LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' +LOCK TABLES performance_schema.events_waits_history WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_history' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result b/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result index 494469a0db8..2ce949b2228 100644 --- a/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result +++ b/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result @@ -1,36 +1,36 @@ -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG +select * from performance_schema.events_waits_history_long where event_name like 'Wait/Synch/%' limit 1; THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS # # # # # # # # NULL NULL NULL # NULL # NULL 0 -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG +select * from performance_schema.events_waits_history_long where event_name='FOO'; THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG +select * from performance_schema.events_waits_history_long where event_name like 'Wait/Synch/%' order by timer_wait limit 1; THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS # # # # # # # # NULL NULL NULL # NULL # NULL 0 -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG +select * from performance_schema.events_waits_history_long where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1; THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS # # # # # # # # NULL NULL NULL # NULL # NULL 0 -insert into performance_schema.EVENTS_WAITS_HISTORY_LONG +insert into performance_schema.events_waits_history_long set thread_id='1', event_id=1, event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' -update performance_schema.EVENTS_WAITS_HISTORY_LONG +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_history_long' +update performance_schema.events_waits_history_long set timer_start=12; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' -update performance_schema.EVENTS_WAITS_HISTORY_LONG +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history_long' +update performance_schema.events_waits_history_long set timer_start=12 where thread_id=0; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' -delete from performance_schema.EVENTS_WAITS_HISTORY_LONG +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history_long' +delete from performance_schema.events_waits_history_long where thread_id=1; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' -delete from performance_schema.EVENTS_WAITS_HISTORY_LONG; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' -LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY_LONG READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history_long' +delete from performance_schema.events_waits_history_long; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history_long' +LOCK TABLES performance_schema.events_waits_history_long READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_history_long' UNLOCK TABLES; -LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY_LONG WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' +LOCK TABLES performance_schema.events_waits_history_long WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_history_long' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_instance.result b/mysql-test/suite/perfschema/r/dml_ews_by_instance.result index dc262982340..0a745a2c38a 100644 --- a/mysql-test/suite/perfschema/r/dml_ews_by_instance.result +++ b/mysql-test/suite/perfschema/r/dml_ews_by_instance.result @@ -1,45 +1,45 @@ -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +select * from performance_schema.events_waits_summary_by_instance where event_name like 'Wait/Synch/%' limit 1; EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT # # # # # # # -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +select * from performance_schema.events_waits_summary_by_instance where event_name='FOO'; EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +select * from performance_schema.events_waits_summary_by_instance order by count_star limit 1; EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT # # # # # # # -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +select * from performance_schema.events_waits_summary_by_instance order by count_star desc limit 1; EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT # # # # # # # -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +select * from performance_schema.events_waits_summary_by_instance where min_timer_wait > 0 order by count_star limit 1; EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT # # # # # # # -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +select * from performance_schema.events_waits_summary_by_instance where min_timer_wait > 0 order by count_star desc limit 1; EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT # # # # # # # -insert into performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +insert into performance_schema.events_waits_summary_by_instance set event_name='FOO', object_instance_begin=0, count_star=1, sum_timer_wait=2, min_timer_wait=3, avg_timer_wait=4, max_timer_wait=5; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' -update performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance' +update performance_schema.events_waits_summary_by_instance set count_star=12; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' -update performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance' +update performance_schema.events_waits_summary_by_instance set count_star=12 where event_name like "FOO"; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' -delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance' +delete from performance_schema.events_waits_summary_by_instance where count_star=1; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' -delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' -LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance' +delete from performance_schema.events_waits_summary_by_instance; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance' +LOCK TABLES performance_schema.events_waits_summary_by_instance READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance' UNLOCK TABLES; -LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' +LOCK TABLES performance_schema.events_waits_summary_by_instance WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result index 2a085659431..c64bcdd40f6 100644 --- a/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result +++ b/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result @@ -1,29 +1,29 @@ -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +select * from performance_schema.events_waits_summary_by_thread_by_event_name where event_name like 'Wait/Synch/%' limit 1; THREAD_ID EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT # # # # # # # -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +select * from performance_schema.events_waits_summary_by_thread_by_event_name where event_name='FOO'; THREAD_ID EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT -insert into performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +insert into performance_schema.events_waits_summary_by_thread_by_event_name set event_name='FOO', thread_id=1, count_star=1, sum_timer_wait=2, min_timer_wait=3, avg_timer_wait=4, max_timer_wait=5; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' -update performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name' +update performance_schema.events_waits_summary_by_thread_by_event_name set count_star=12; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' -update performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name' +update performance_schema.events_waits_summary_by_thread_by_event_name set count_star=12 where event_name like "FOO"; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' -delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name' +delete from performance_schema.events_waits_summary_by_thread_by_event_name where count_star=1; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' -delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' -LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name' +delete from performance_schema.events_waits_summary_by_thread_by_event_name; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name' +LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name' UNLOCK TABLES; -LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' +LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result index 64ede2fddac..c59451922c5 100644 --- a/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result +++ b/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result @@ -1,28 +1,28 @@ -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +select * from performance_schema.events_waits_summary_global_by_event_name where event_name like 'Wait/Synch/%' limit 1; EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT # # # # # # -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +select * from performance_schema.events_waits_summary_global_by_event_name where event_name='FOO'; EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT -insert into performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +insert into performance_schema.events_waits_summary_global_by_event_name set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3, avg_timer_wait=4, max_timer_wait=5; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' -update performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name' +update performance_schema.events_waits_summary_global_by_event_name set count_star=12; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' -update performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name' +update performance_schema.events_waits_summary_global_by_event_name set count_star=12 where event_name like "FOO"; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' -delete from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name' +delete from performance_schema.events_waits_summary_global_by_event_name where count_star=1; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' -delete from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' -LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name' +delete from performance_schema.events_waits_summary_global_by_event_name; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name' +LOCK TABLES performance_schema.events_waits_summary_global_by_event_name READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name' UNLOCK TABLES; -LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' +LOCK TABLES performance_schema.events_waits_summary_global_by_event_name WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_file_instances.result b/mysql-test/suite/perfschema/r/dml_file_instances.result index e15d68cbad3..5a51a4ca018 100644 --- a/mysql-test/suite/perfschema/r/dml_file_instances.result +++ b/mysql-test/suite/perfschema/r/dml_file_instances.result @@ -1,23 +1,23 @@ -select * from performance_schema.FILE_INSTANCES limit 1; +select * from performance_schema.file_instances limit 1; FILE_NAME EVENT_NAME OPEN_COUNT # # # -select * from performance_schema.FILE_INSTANCES +select * from performance_schema.file_instances where file_name='FOO'; FILE_NAME EVENT_NAME OPEN_COUNT -insert into performance_schema.FILE_INSTANCES +insert into performance_schema.file_instances set file_name='FOO', event_name='BAR', open_count=12; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' -update performance_schema.FILE_INSTANCES +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_instances' +update performance_schema.file_instances set file_name='FOO'; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' -delete from performance_schema.FILE_INSTANCES +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_instances' +delete from performance_schema.file_instances where event_name like "wait/%"; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' -delete from performance_schema.FILE_INSTANCES; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' -LOCK TABLES performance_schema.FILE_INSTANCES READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_instances' +delete from performance_schema.file_instances; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_instances' +LOCK TABLES performance_schema.file_instances READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances' UNLOCK TABLES; -LOCK TABLES performance_schema.FILE_INSTANCES WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' +LOCK TABLES performance_schema.file_instances WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result b/mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result index 1ecc82f40a5..97a196dbf19 100644 --- a/mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result +++ b/mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result @@ -1,28 +1,28 @@ -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME +select * from performance_schema.file_summary_by_event_name where event_name like 'Wait/io/%' limit 1; EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE # # # # # -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME +select * from performance_schema.file_summary_by_event_name where event_name='FOO'; EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE -insert into performance_schema.FILE_SUMMARY_BY_EVENT_NAME +insert into performance_schema.file_summary_by_event_name set event_name='FOO', count_read=1, count_write=2, sum_number_of_bytes_read=4, sum_number_of_bytes_write=5; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' -update performance_schema.FILE_SUMMARY_BY_EVENT_NAME +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_summary_by_event_name' +update performance_schema.file_summary_by_event_name set count_read=12; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' -update performance_schema.FILE_SUMMARY_BY_EVENT_NAME +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name' +update performance_schema.file_summary_by_event_name set count_write=12 where event_name like "FOO"; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' -delete from performance_schema.FILE_SUMMARY_BY_EVENT_NAME +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name' +delete from performance_schema.file_summary_by_event_name where count_read=1; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' -delete from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' -LOCK TABLES performance_schema.FILE_SUMMARY_BY_EVENT_NAME READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name' +delete from performance_schema.file_summary_by_event_name; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name' +LOCK TABLES performance_schema.file_summary_by_event_name READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_summary_by_event_name' UNLOCK TABLES; -LOCK TABLES performance_schema.FILE_SUMMARY_BY_EVENT_NAME WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' +LOCK TABLES performance_schema.file_summary_by_event_name WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_summary_by_event_name' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result b/mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result index 05b204cc1a9..d85e23cb6f4 100644 --- a/mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result +++ b/mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result @@ -1,28 +1,28 @@ -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE +select * from performance_schema.file_summary_by_instance where event_name like 'Wait/io/%' limit 1; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE # # # # # # -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE +select * from performance_schema.file_summary_by_instance where event_name='FOO'; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE -insert into performance_schema.FILE_SUMMARY_BY_INSTANCE +insert into performance_schema.file_summary_by_instance set event_name='FOO', count_read=1, count_write=2, sum_number_of_bytes_read=4, sum_number_of_bytes_write=5; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' -update performance_schema.FILE_SUMMARY_BY_INSTANCE +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_summary_by_instance' +update performance_schema.file_summary_by_instance set count_read=12; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' -update performance_schema.FILE_SUMMARY_BY_INSTANCE +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_instance' +update performance_schema.file_summary_by_instance set count_write=12 where event_name like "FOO"; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' -delete from performance_schema.FILE_SUMMARY_BY_INSTANCE +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_instance' +delete from performance_schema.file_summary_by_instance where count_read=1; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' -delete from performance_schema.FILE_SUMMARY_BY_INSTANCE; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' -LOCK TABLES performance_schema.FILE_SUMMARY_BY_INSTANCE READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_instance' +delete from performance_schema.file_summary_by_instance; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_instance' +LOCK TABLES performance_schema.file_summary_by_instance READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_summary_by_instance' UNLOCK TABLES; -LOCK TABLES performance_schema.FILE_SUMMARY_BY_INSTANCE WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' +LOCK TABLES performance_schema.file_summary_by_instance WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_summary_by_instance' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_mutex_instances.result b/mysql-test/suite/perfschema/r/dml_mutex_instances.result index 862123b3450..1ea7311b149 100644 --- a/mysql-test/suite/perfschema/r/dml_mutex_instances.result +++ b/mysql-test/suite/perfschema/r/dml_mutex_instances.result @@ -1,23 +1,23 @@ -select * from performance_schema.MUTEX_INSTANCES limit 1; +select * from performance_schema.mutex_instances limit 1; NAME OBJECT_INSTANCE_BEGIN LOCKED_BY_THREAD_ID # # # -select * from performance_schema.MUTEX_INSTANCES +select * from performance_schema.mutex_instances where name='FOO'; NAME OBJECT_INSTANCE_BEGIN LOCKED_BY_THREAD_ID -insert into performance_schema.MUTEX_INSTANCES +insert into performance_schema.mutex_instances set name='FOO', object_instance_begin=12; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES' -update performance_schema.MUTEX_INSTANCES +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'mutex_instances' +update performance_schema.mutex_instances set name='FOO'; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES' -delete from performance_schema.MUTEX_INSTANCES +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'mutex_instances' +delete from performance_schema.mutex_instances where name like "wait/%"; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES' -delete from performance_schema.MUTEX_INSTANCES; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES' -LOCK TABLES performance_schema.MUTEX_INSTANCES READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'mutex_instances' +delete from performance_schema.mutex_instances; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'mutex_instances' +LOCK TABLES performance_schema.mutex_instances READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'mutex_instances' UNLOCK TABLES; -LOCK TABLES performance_schema.MUTEX_INSTANCES WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES' +LOCK TABLES performance_schema.mutex_instances WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'mutex_instances' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_performance_timers.result b/mysql-test/suite/perfschema/r/dml_performance_timers.result index 99c1c74b797..f345cce921e 100644 --- a/mysql-test/suite/perfschema/r/dml_performance_timers.result +++ b/mysql-test/suite/perfschema/r/dml_performance_timers.result @@ -1,29 +1,29 @@ -select * from performance_schema.PERFORMANCE_TIMERS; +select * from performance_schema.performance_timers; TIMER_NAME TIMER_FREQUENCY TIMER_RESOLUTION TIMER_OVERHEAD CYCLE <frequency> <resolution> <overhead> NANOSECOND <frequency> <resolution> <overhead> MICROSECOND <frequency> <resolution> <overhead> MILLISECOND <frequency> <resolution> <overhead> TICK <frequency> <resolution> <overhead> -select * from performance_schema.PERFORMANCE_TIMERS +select * from performance_schema.performance_timers where timer_name='CYCLE'; TIMER_NAME TIMER_FREQUENCY TIMER_RESOLUTION TIMER_OVERHEAD CYCLE <frequency> <resolution> <overhead> -insert into performance_schema.PERFORMANCE_TIMERS +insert into performance_schema.performance_timers set timer_name='FOO', timer_frequency=1, timer_resolution=2, timer_overhead=3; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS' -update performance_schema.PERFORMANCE_TIMERS +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'performance_timers' +update performance_schema.performance_timers set timer_frequency=12 where timer_name='CYCLE'; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS' -delete from performance_schema.PERFORMANCE_TIMERS; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS' -delete from performance_schema.PERFORMANCE_TIMERS +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'performance_timers' +delete from performance_schema.performance_timers; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'performance_timers' +delete from performance_schema.performance_timers where timer_name='CYCLE'; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS' -LOCK TABLES performance_schema.PERFORMANCE_TIMERS READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'performance_timers' +LOCK TABLES performance_schema.performance_timers READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'performance_timers' UNLOCK TABLES; -LOCK TABLES performance_schema.PERFORMANCE_TIMERS WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS' +LOCK TABLES performance_schema.performance_timers WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'performance_timers' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result index 686007e58e9..964fa0fa46f 100644 --- a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result +++ b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result @@ -1,23 +1,23 @@ -select * from performance_schema.RWLOCK_INSTANCES limit 1; +select * from performance_schema.rwlock_instances limit 1; NAME OBJECT_INSTANCE_BEGIN WRITE_LOCKED_BY_THREAD_ID READ_LOCKED_BY_COUNT # # # # -select * from performance_schema.RWLOCK_INSTANCES +select * from performance_schema.rwlock_instances where name='FOO'; NAME OBJECT_INSTANCE_BEGIN WRITE_LOCKED_BY_THREAD_ID READ_LOCKED_BY_COUNT -insert into performance_schema.RWLOCK_INSTANCES +insert into performance_schema.rwlock_instances set name='FOO', object_instance_begin=12; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES' -update performance_schema.RWLOCK_INSTANCES +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'rwlock_instances' +update performance_schema.rwlock_instances set name='FOO'; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES' -delete from performance_schema.RWLOCK_INSTANCES +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'rwlock_instances' +delete from performance_schema.rwlock_instances where name like "wait/%"; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES' -delete from performance_schema.RWLOCK_INSTANCES; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES' -LOCK TABLES performance_schema.RWLOCK_INSTANCES READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'rwlock_instances' +delete from performance_schema.rwlock_instances; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'rwlock_instances' +LOCK TABLES performance_schema.rwlock_instances READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'rwlock_instances' UNLOCK TABLES; -LOCK TABLES performance_schema.RWLOCK_INSTANCES WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES' +LOCK TABLES performance_schema.rwlock_instances WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'rwlock_instances' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_setup_consumers.result b/mysql-test/suite/perfschema/r/dml_setup_consumers.result index 44ed751dcd2..db0a6820de9 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_consumers.result +++ b/mysql-test/suite/perfschema/r/dml_setup_consumers.result @@ -1,4 +1,4 @@ -select * from performance_schema.SETUP_CONSUMERS; +select * from performance_schema.setup_consumers; NAME ENABLED events_waits_current YES events_waits_history YES @@ -8,11 +8,11 @@ events_waits_summary_by_event_name YES events_waits_summary_by_instance YES file_summary_by_event_name YES file_summary_by_instance YES -select * from performance_schema.SETUP_CONSUMERS +select * from performance_schema.setup_consumers where name='events_waits_current'; NAME ENABLED events_waits_current YES -select * from performance_schema.SETUP_CONSUMERS +select * from performance_schema.setup_consumers where enabled='YES'; NAME ENABLED events_waits_current YES @@ -23,23 +23,23 @@ events_waits_summary_by_event_name YES events_waits_summary_by_instance YES file_summary_by_event_name YES file_summary_by_instance YES -select * from performance_schema.SETUP_CONSUMERS +select * from performance_schema.setup_consumers where enabled='NO'; NAME ENABLED -insert into performance_schema.SETUP_CONSUMERS +insert into performance_schema.setup_consumers set name='FOO', enabled='YES'; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'SETUP_CONSUMERS' -update performance_schema.SETUP_CONSUMERS +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_consumers' +update performance_schema.setup_consumers set name='FOO'; ERROR HY000: Invalid performance_schema usage. -update performance_schema.SETUP_CONSUMERS +update performance_schema.setup_consumers set enabled='YES'; -delete from performance_schema.SETUP_CONSUMERS; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_CONSUMERS' -delete from performance_schema.SETUP_CONSUMERS +delete from performance_schema.setup_consumers; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_consumers' +delete from performance_schema.setup_consumers where name='events_waits_current'; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_CONSUMERS' -LOCK TABLES performance_schema.SETUP_CONSUMERS READ; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_consumers' +LOCK TABLES performance_schema.setup_consumers READ; UNLOCK TABLES; -LOCK TABLES performance_schema.SETUP_CONSUMERS WRITE; +LOCK TABLES performance_schema.setup_consumers WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result index 2338252976c..7dbb7274c1d 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result +++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result @@ -1,5 +1,5 @@ -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_INSTRUMENTS +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_instruments where name like 'Wait/Synch/Mutex/sql/%' and name not in ('wait/synch/mutex/sql/DEBUG_SYNC::mutex') order by name limit 10; @@ -14,7 +14,7 @@ wait/synch/mutex/sql/LOCK_audit_mask YES YES wait/synch/mutex/sql/LOCK_connection_count YES YES wait/synch/mutex/sql/LOCK_crypt YES YES wait/synch/mutex/sql/LOCK_delayed_create YES YES -select * from performance_schema.SETUP_INSTRUMENTS +select * from performance_schema.setup_instruments where name like 'Wait/Synch/Rwlock/sql/%' and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock') order by name limit 10; @@ -29,7 +29,7 @@ wait/synch/rwlock/sql/MDL_context::LOCK_waiting_for YES YES wait/synch/rwlock/sql/MDL_lock::rwlock YES YES wait/synch/rwlock/sql/Query_cache_query::lock YES YES wait/synch/rwlock/sql/THR_LOCK_servers YES YES -select * from performance_schema.SETUP_INSTRUMENTS +select * from performance_schema.setup_instruments where name like 'Wait/Synch/Cond/sql/%' and name not in ( 'wait/synch/cond/sql/COND_handler_count', @@ -46,29 +46,29 @@ wait/synch/cond/sql/COND_thread_cache YES YES wait/synch/cond/sql/COND_thread_count YES YES wait/synch/cond/sql/Delayed_insert::cond YES YES wait/synch/cond/sql/Delayed_insert::cond_client YES YES -select * from performance_schema.SETUP_INSTRUMENTS +select * from performance_schema.setup_instruments where name='Wait'; -select * from performance_schema.SETUP_INSTRUMENTS +select * from performance_schema.setup_instruments where enabled='YES'; -insert into performance_schema.SETUP_INSTRUMENTS +insert into performance_schema.setup_instruments set name='FOO', enabled='YES', timed='YES'; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' -update performance_schema.SETUP_INSTRUMENTS +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments' +update performance_schema.setup_instruments set name='FOO'; ERROR HY000: Invalid performance_schema usage. -update performance_schema.SETUP_INSTRUMENTS +update performance_schema.setup_instruments set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS +update performance_schema.setup_instruments set timed='NO'; -select * from performance_schema.SETUP_INSTRUMENTS; -update performance_schema.SETUP_INSTRUMENTS +select * from performance_schema.setup_instruments; +update performance_schema.setup_instruments set enabled='YES', timed='YES'; -delete from performance_schema.SETUP_INSTRUMENTS; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' -delete from performance_schema.SETUP_INSTRUMENTS +delete from performance_schema.setup_instruments; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_instruments' +delete from performance_schema.setup_instruments where name like 'Wait/Synch/%'; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' -LOCK TABLES performance_schema.SETUP_INSTRUMENTS READ; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_instruments' +LOCK TABLES performance_schema.setup_instruments READ; UNLOCK TABLES; -LOCK TABLES performance_schema.SETUP_INSTRUMENTS WRITE; +LOCK TABLES performance_schema.setup_instruments WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_setup_timers.result b/mysql-test/suite/perfschema/r/dml_setup_timers.result index a9bee916cde..ad1f6df3e81 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_timers.result +++ b/mysql-test/suite/perfschema/r/dml_setup_timers.result @@ -1,33 +1,33 @@ -select * from performance_schema.SETUP_TIMERS; +select * from performance_schema.setup_timers; NAME TIMER_NAME wait CYCLE -select * from performance_schema.SETUP_TIMERS +select * from performance_schema.setup_timers where name='Wait'; NAME TIMER_NAME wait CYCLE -select * from performance_schema.SETUP_TIMERS +select * from performance_schema.setup_timers where timer_name='CYCLE'; NAME TIMER_NAME wait CYCLE -insert into performance_schema.SETUP_TIMERS +insert into performance_schema.setup_timers set name='FOO', timer_name='CYCLE'; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'SETUP_TIMERS' -update performance_schema.SETUP_TIMERS +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_timers' +update performance_schema.setup_timers set name='FOO'; ERROR HY000: Invalid performance_schema usage. -update performance_schema.SETUP_TIMERS +update performance_schema.setup_timers set timer_name='MILLISECOND'; -select * from performance_schema.SETUP_TIMERS; +select * from performance_schema.setup_timers; NAME TIMER_NAME wait MILLISECOND -update performance_schema.SETUP_TIMERS +update performance_schema.setup_timers set timer_name='CYCLE'; -delete from performance_schema.SETUP_TIMERS; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_TIMERS' -delete from performance_schema.SETUP_TIMERS +delete from performance_schema.setup_timers; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_timers' +delete from performance_schema.setup_timers where name='Wait'; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_TIMERS' -LOCK TABLES performance_schema.SETUP_TIMERS READ; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_timers' +LOCK TABLES performance_schema.setup_timers READ; UNLOCK TABLES; -LOCK TABLES performance_schema.SETUP_TIMERS WRITE; +LOCK TABLES performance_schema.setup_timers WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/dml_threads.result b/mysql-test/suite/perfschema/r/dml_threads.result index 261e7977aa5..8c61521d091 100644 --- a/mysql-test/suite/perfschema/r/dml_threads.result +++ b/mysql-test/suite/perfschema/r/dml_threads.result @@ -1,27 +1,27 @@ -select * from performance_schema.THREADS +select * from performance_schema.threads where name like 'Thread/%' limit 1; THREAD_ID PROCESSLIST_ID NAME # # # -select * from performance_schema.THREADS +select * from performance_schema.threads where name='FOO'; THREAD_ID PROCESSLIST_ID NAME -insert into performance_schema.THREADS +insert into performance_schema.threads set name='FOO', thread_id=1, processlist_id=2; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'THREADS' -update performance_schema.THREADS +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'threads' +update performance_schema.threads set thread_id=12; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'THREADS' -update performance_schema.THREADS +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'threads' +update performance_schema.threads set thread_id=12 where name like "FOO"; -ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'THREADS' -delete from performance_schema.THREADS +ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'threads' +delete from performance_schema.threads where id=1; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'THREADS' -delete from performance_schema.THREADS; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'THREADS' -LOCK TABLES performance_schema.THREADS READ; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'THREADS' +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'threads' +delete from performance_schema.threads; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'threads' +LOCK TABLES performance_schema.threads READ; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'threads' UNLOCK TABLES; -LOCK TABLES performance_schema.THREADS WRITE; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'THREADS' +LOCK TABLES performance_schema.threads WRITE; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'threads' UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/r/func_file_io.result b/mysql-test/suite/perfschema/r/func_file_io.result index 655ce1394f9..781851bd11c 100644 --- a/mysql-test/suite/perfschema/r/func_file_io.result +++ b/mysql-test/suite/perfschema/r/func_file_io.result @@ -1,18 +1,18 @@ -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO', timed = 'YES'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' +UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES'; +UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/io/file/%'; DROP TABLE IF EXISTS t1; CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value') ENGINE=MyISAM; INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8); -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; SELECT * FROM t1 WHERE id = 1; id b 1 initial value SET @before_count = (SELECT SUM(TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile') AND (OBJECT_NAME LIKE '%t1.MYD')); SELECT IF(@before_count > 0, 'Success', 'Failure') has_instrumentation; @@ -24,15 +24,15 @@ id b 2 initial value 3 initial value SET @after_count = (SELECT SUM(TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile') AND (OBJECT_NAME LIKE '%t1.MYD') AND (1 = 1)); SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_ff1_timed; test_ff1_timed Success -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled='NO'; +UPDATE performance_schema.setup_instruments SET enabled='NO'; SET @before_count = (SELECT SUM(TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile') AND (OBJECT_NAME LIKE '%t1.MYD') AND (2 = 2)); SELECT * FROM t1 WHERE id < 6; @@ -43,40 +43,40 @@ id b 4 initial value 5 initial value SET @after_count = (SELECT SUM(TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile') AND (OBJECT_NAME LIKE '%t1.MYD') AND (3 = 3)); SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_ff2_timed; test_ff2_timed Success -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' +UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/io/file/%'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET timed = 'NO'; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +UPDATE performance_schema.setup_instruments SET timed = 'NO'; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; SELECT * FROM t1 WHERE id > 4; id b 5 initial value 6 initial value 7 initial value 8 initial value -SELECT * FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +SELECT * FROM performance_schema.events_waits_history_long WHERE TIMER_WAIT != NULL OR TIMER_START != NULL OR TIMER_END != NULL; THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS -SELECT * FROM performance_schema.EVENTS_WAITS_HISTORY +SELECT * FROM performance_schema.events_waits_history WHERE TIMER_WAIT != NULL OR TIMER_START != NULL OR TIMER_END != NULL; THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS -SELECT * FROM performance_schema.EVENTS_WAITS_CURRENT +SELECT * FROM performance_schema.events_waits_current WHERE TIMER_WAIT != NULL OR TIMER_START != NULL OR TIMER_END != NULL; THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS -UPDATE performance_schema.SETUP_INSTRUMENTS SET timed = 'YES'; +UPDATE performance_schema.setup_instruments SET timed = 'YES'; SELECT * FROM t1 WHERE id < 4; id b 1 initial value @@ -87,16 +87,16 @@ SELECT SUM(COUNT_READ) AS sum_count_read, SUM(COUNT_WRITE) AS sum_count_write, SUM(SUM_NUMBER_OF_BYTES_READ) AS sum_num_bytes_read, SUM(SUM_NUMBER_OF_BYTES_WRITE) AS sum_num_bytes_write -FROM performance_schema.FILE_SUMMARY_BY_INSTANCE +FROM performance_schema.file_summary_by_instance WHERE FILE_NAME LIKE CONCAT('%', @@tmpdir, '%') ORDER BY NULL; SELECT EVENT_NAME, COUNT_STAR, AVG_TIMER_WAIT, SUM_TIMER_WAIT -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +FROM performance_schema.events_waits_summary_global_by_event_name WHERE COUNT_STAR > 0 ORDER BY SUM_TIMER_WAIT DESC LIMIT 10; SELECT h.EVENT_NAME, SUM(h.TIMER_WAIT) TOTAL_WAIT -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG h -INNER JOIN performance_schema.THREADS p USING (THREAD_ID) +FROM performance_schema.events_waits_history_long h +INNER JOIN performance_schema.threads p USING (THREAD_ID) WHERE p.PROCESSLIST_ID = 1 GROUP BY h.EVENT_NAME HAVING TOTAL_WAIT > 0; diff --git a/mysql-test/suite/perfschema/r/func_mutex.result b/mysql-test/suite/perfschema/r/func_mutex.result index e32d7267bb1..d767455609d 100644 --- a/mysql-test/suite/perfschema/r/func_mutex.result +++ b/mysql-test/suite/perfschema/r/func_mutex.result @@ -1,19 +1,19 @@ -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO', timed = 'YES'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' +UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES'; +UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/synch/mutex/%' OR name LIKE 'wait/synch/rwlock/%'; DROP TABLE IF EXISTS t1; CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value') ENGINE=MyISAM; INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8); -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; SELECT * FROM t1 WHERE id = 1; id b 1 initial value SET @before_count = (SELECT SUM(TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open')); SELECT * FROM t1; id b @@ -26,21 +26,21 @@ id b 7 initial value 8 initial value SET @after_count = (SELECT SUM(TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open')); SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_timed; test_fm1_timed Success -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO' +UPDATE performance_schema.setup_instruments SET enabled = 'NO' WHERE NAME = 'wait/synch/mutex/sql/LOCK_open'; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; SELECT * FROM t1 WHERE id = 1; id b 1 initial value SET @before_count = (SELECT SUM(TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open')); SELECT * FROM t1; id b @@ -53,19 +53,19 @@ id b 7 initial value 8 initial value SET @after_count = (SELECT SUM(TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open')); SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_timed; test_fm2_timed Success -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; SELECT * FROM t1 WHERE id = 1; id b 1 initial value SET @before_count = (SELECT SUM(TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); SELECT * FROM t1; id b @@ -78,21 +78,21 @@ id b 7 initial value 8 initial value SET @after_count = (SELECT SUM(TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_rw_timed; test_fm1_rw_timed Success -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO' +UPDATE performance_schema.setup_instruments SET enabled = 'NO' WHERE NAME = 'wait/synch/rwlock/sql/LOCK_grant'; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; SELECT * FROM t1 WHERE id = 1; id b 1 initial value SET @before_count = (SELECT SUM(TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); SELECT * FROM t1; id b @@ -105,7 +105,7 @@ id b 7 initial value 8 initial value SET @after_count = (SELECT SUM(TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_rw_timed; test_fm2_rw_timed diff --git a/mysql-test/suite/perfschema/r/global_read_lock.result b/mysql-test/suite/perfschema/r/global_read_lock.result index 93d6adfd049..8a58c072b7a 100644 --- a/mysql-test/suite/perfschema/r/global_read_lock.result +++ b/mysql-test/suite/perfschema/r/global_read_lock.result @@ -2,31 +2,31 @@ use performance_schema; grant SELECT, UPDATE, LOCK TABLES on performance_schema.* to pfsuser@localhost; flush privileges; connect (con1, localhost, pfsuser, , test); -lock tables performance_schema.SETUP_INSTRUMENTS read; -select * from performance_schema.SETUP_INSTRUMENTS; +lock tables performance_schema.setup_instruments read; +select * from performance_schema.setup_instruments; unlock tables; -lock tables performance_schema.SETUP_INSTRUMENTS write; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +lock tables performance_schema.setup_instruments write; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES'; unlock tables; connection default; flush tables with read lock; connection con1; -lock tables performance_schema.SETUP_INSTRUMENTS read; -select * from performance_schema.SETUP_INSTRUMENTS; +lock tables performance_schema.setup_instruments read; +select * from performance_schema.setup_instruments; unlock tables; -lock tables performance_schema.SETUP_INSTRUMENTS write; +lock tables performance_schema.setup_instruments write; connection default; select event_name, left(source, locate(":", source)) as short_source, timer_end, timer_wait, operation -from performance_schema.EVENTS_WAITS_CURRENT +from performance_schema.events_waits_current where event_name like "wait/synch/cond/sql/COND_global_read_lock"; event_name short_source timer_end timer_wait operation wait/synch/cond/sql/COND_global_read_lock lock.cc: NULL NULL wait unlock tables; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES'; unlock tables; connection default; drop user pfsuser@localhost; diff --git a/mysql-test/suite/perfschema/r/information_schema.result b/mysql-test/suite/perfschema/r/information_schema.result index 8e7478564fb..ab464cce687 100644 --- a/mysql-test/suite/perfschema/r/information_schema.result +++ b/mysql-test/suite/perfschema/r/information_schema.result @@ -1,189 +1,189 @@ -select TABLE_SCHEMA, upper(TABLE_NAME), TABLE_CATALOG +select TABLE_SCHEMA, lower(TABLE_NAME), TABLE_CATALOG from information_schema.tables where TABLE_SCHEMA='performance_schema'; -TABLE_SCHEMA upper(TABLE_NAME) TABLE_CATALOG -performance_schema COND_INSTANCES def -performance_schema EVENTS_WAITS_CURRENT def -performance_schema EVENTS_WAITS_HISTORY def -performance_schema EVENTS_WAITS_HISTORY_LONG def -performance_schema EVENTS_WAITS_SUMMARY_BY_INSTANCE def -performance_schema EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME def -performance_schema EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME def -performance_schema FILE_INSTANCES def -performance_schema FILE_SUMMARY_BY_EVENT_NAME def -performance_schema FILE_SUMMARY_BY_INSTANCE def -performance_schema MUTEX_INSTANCES def -performance_schema PERFORMANCE_TIMERS def -performance_schema RWLOCK_INSTANCES def -performance_schema SETUP_CONSUMERS def -performance_schema SETUP_INSTRUMENTS def -performance_schema SETUP_TIMERS def -performance_schema THREADS def -select upper(TABLE_NAME), TABLE_TYPE, ENGINE +TABLE_SCHEMA lower(TABLE_NAME) TABLE_CATALOG +performance_schema cond_instances def +performance_schema events_waits_current def +performance_schema events_waits_history def +performance_schema events_waits_history_long def +performance_schema events_waits_summary_by_instance def +performance_schema events_waits_summary_by_thread_by_event_name def +performance_schema events_waits_summary_global_by_event_name def +performance_schema file_instances def +performance_schema file_summary_by_event_name def +performance_schema file_summary_by_instance def +performance_schema mutex_instances def +performance_schema performance_timers def +performance_schema rwlock_instances def +performance_schema setup_consumers def +performance_schema setup_instruments def +performance_schema setup_timers def +performance_schema threads def +select lower(TABLE_NAME), TABLE_TYPE, ENGINE from information_schema.tables where TABLE_SCHEMA='performance_schema'; -upper(TABLE_NAME) TABLE_TYPE ENGINE -COND_INSTANCES BASE TABLE PERFORMANCE_SCHEMA -EVENTS_WAITS_CURRENT BASE TABLE PERFORMANCE_SCHEMA -EVENTS_WAITS_HISTORY BASE TABLE PERFORMANCE_SCHEMA -EVENTS_WAITS_HISTORY_LONG BASE TABLE PERFORMANCE_SCHEMA -EVENTS_WAITS_SUMMARY_BY_INSTANCE BASE TABLE PERFORMANCE_SCHEMA -EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME BASE TABLE PERFORMANCE_SCHEMA -EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME BASE TABLE PERFORMANCE_SCHEMA -FILE_INSTANCES BASE TABLE PERFORMANCE_SCHEMA -FILE_SUMMARY_BY_EVENT_NAME BASE TABLE PERFORMANCE_SCHEMA -FILE_SUMMARY_BY_INSTANCE BASE TABLE PERFORMANCE_SCHEMA -MUTEX_INSTANCES BASE TABLE PERFORMANCE_SCHEMA -PERFORMANCE_TIMERS BASE TABLE PERFORMANCE_SCHEMA -RWLOCK_INSTANCES BASE TABLE PERFORMANCE_SCHEMA -SETUP_CONSUMERS BASE TABLE PERFORMANCE_SCHEMA -SETUP_INSTRUMENTS BASE TABLE PERFORMANCE_SCHEMA -SETUP_TIMERS BASE TABLE PERFORMANCE_SCHEMA -THREADS BASE TABLE PERFORMANCE_SCHEMA -select upper(TABLE_NAME), VERSION, ROW_FORMAT +lower(TABLE_NAME) TABLE_TYPE ENGINE +cond_instances BASE TABLE PERFORMANCE_SCHEMA +events_waits_current BASE TABLE PERFORMANCE_SCHEMA +events_waits_history BASE TABLE PERFORMANCE_SCHEMA +events_waits_history_long BASE TABLE PERFORMANCE_SCHEMA +events_waits_summary_by_instance BASE TABLE PERFORMANCE_SCHEMA +events_waits_summary_by_thread_by_event_name BASE TABLE PERFORMANCE_SCHEMA +events_waits_summary_global_by_event_name BASE TABLE PERFORMANCE_SCHEMA +file_instances BASE TABLE PERFORMANCE_SCHEMA +file_summary_by_event_name BASE TABLE PERFORMANCE_SCHEMA +file_summary_by_instance BASE TABLE PERFORMANCE_SCHEMA +mutex_instances BASE TABLE PERFORMANCE_SCHEMA +performance_timers BASE TABLE PERFORMANCE_SCHEMA +rwlock_instances BASE TABLE PERFORMANCE_SCHEMA +setup_consumers BASE TABLE PERFORMANCE_SCHEMA +setup_instruments BASE TABLE PERFORMANCE_SCHEMA +setup_timers BASE TABLE PERFORMANCE_SCHEMA +threads BASE TABLE PERFORMANCE_SCHEMA +select lower(TABLE_NAME), VERSION, ROW_FORMAT from information_schema.tables where TABLE_SCHEMA='performance_schema'; -upper(TABLE_NAME) VERSION ROW_FORMAT -COND_INSTANCES 10 Dynamic -EVENTS_WAITS_CURRENT 10 Dynamic -EVENTS_WAITS_HISTORY 10 Dynamic -EVENTS_WAITS_HISTORY_LONG 10 Dynamic -EVENTS_WAITS_SUMMARY_BY_INSTANCE 10 Dynamic -EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME 10 Dynamic -EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME 10 Dynamic -FILE_INSTANCES 10 Dynamic -FILE_SUMMARY_BY_EVENT_NAME 10 Dynamic -FILE_SUMMARY_BY_INSTANCE 10 Dynamic -MUTEX_INSTANCES 10 Dynamic -PERFORMANCE_TIMERS 10 Fixed -RWLOCK_INSTANCES 10 Dynamic -SETUP_CONSUMERS 10 Dynamic -SETUP_INSTRUMENTS 10 Dynamic -SETUP_TIMERS 10 Dynamic -THREADS 10 Dynamic -select upper(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH +lower(TABLE_NAME) VERSION ROW_FORMAT +cond_instances 10 Dynamic +events_waits_current 10 Dynamic +events_waits_history 10 Dynamic +events_waits_history_long 10 Dynamic +events_waits_summary_by_instance 10 Dynamic +events_waits_summary_by_thread_by_event_name 10 Dynamic +events_waits_summary_global_by_event_name 10 Dynamic +file_instances 10 Dynamic +file_summary_by_event_name 10 Dynamic +file_summary_by_instance 10 Dynamic +mutex_instances 10 Dynamic +performance_timers 10 Fixed +rwlock_instances 10 Dynamic +setup_consumers 10 Dynamic +setup_instruments 10 Dynamic +setup_timers 10 Dynamic +threads 10 Dynamic +select lower(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH from information_schema.tables where TABLE_SCHEMA='performance_schema'; -upper(TABLE_NAME) TABLE_ROWS AVG_ROW_LENGTH -COND_INSTANCES 1000 0 -EVENTS_WAITS_CURRENT 1000 0 -EVENTS_WAITS_HISTORY 1000 0 -EVENTS_WAITS_HISTORY_LONG 10000 0 -EVENTS_WAITS_SUMMARY_BY_INSTANCE 1000 0 -EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME 1000 0 -EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME 1000 0 -FILE_INSTANCES 1000 0 -FILE_SUMMARY_BY_EVENT_NAME 1000 0 -FILE_SUMMARY_BY_INSTANCE 1000 0 -MUTEX_INSTANCES 1000 0 -PERFORMANCE_TIMERS 5 0 -RWLOCK_INSTANCES 1000 0 -SETUP_CONSUMERS 8 0 -SETUP_INSTRUMENTS 1000 0 -SETUP_TIMERS 1 0 -THREADS 1000 0 -select upper(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH +lower(TABLE_NAME) TABLE_ROWS AVG_ROW_LENGTH +cond_instances 1000 0 +events_waits_current 1000 0 +events_waits_history 1000 0 +events_waits_history_long 10000 0 +events_waits_summary_by_instance 1000 0 +events_waits_summary_by_thread_by_event_name 1000 0 +events_waits_summary_global_by_event_name 1000 0 +file_instances 1000 0 +file_summary_by_event_name 1000 0 +file_summary_by_instance 1000 0 +mutex_instances 1000 0 +performance_timers 5 0 +rwlock_instances 1000 0 +setup_consumers 8 0 +setup_instruments 1000 0 +setup_timers 1 0 +threads 1000 0 +select lower(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH from information_schema.tables where TABLE_SCHEMA='performance_schema'; -upper(TABLE_NAME) DATA_LENGTH MAX_DATA_LENGTH -COND_INSTANCES 0 0 -EVENTS_WAITS_CURRENT 0 0 -EVENTS_WAITS_HISTORY 0 0 -EVENTS_WAITS_HISTORY_LONG 0 0 -EVENTS_WAITS_SUMMARY_BY_INSTANCE 0 0 -EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME 0 0 -EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME 0 0 -FILE_INSTANCES 0 0 -FILE_SUMMARY_BY_EVENT_NAME 0 0 -FILE_SUMMARY_BY_INSTANCE 0 0 -MUTEX_INSTANCES 0 0 -PERFORMANCE_TIMERS 0 0 -RWLOCK_INSTANCES 0 0 -SETUP_CONSUMERS 0 0 -SETUP_INSTRUMENTS 0 0 -SETUP_TIMERS 0 0 -THREADS 0 0 -select upper(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT +lower(TABLE_NAME) DATA_LENGTH MAX_DATA_LENGTH +cond_instances 0 0 +events_waits_current 0 0 +events_waits_history 0 0 +events_waits_history_long 0 0 +events_waits_summary_by_instance 0 0 +events_waits_summary_by_thread_by_event_name 0 0 +events_waits_summary_global_by_event_name 0 0 +file_instances 0 0 +file_summary_by_event_name 0 0 +file_summary_by_instance 0 0 +mutex_instances 0 0 +performance_timers 0 0 +rwlock_instances 0 0 +setup_consumers 0 0 +setup_instruments 0 0 +setup_timers 0 0 +threads 0 0 +select lower(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT from information_schema.tables where TABLE_SCHEMA='performance_schema'; -upper(TABLE_NAME) INDEX_LENGTH DATA_FREE AUTO_INCREMENT -COND_INSTANCES 0 0 NULL -EVENTS_WAITS_CURRENT 0 0 NULL -EVENTS_WAITS_HISTORY 0 0 NULL -EVENTS_WAITS_HISTORY_LONG 0 0 NULL -EVENTS_WAITS_SUMMARY_BY_INSTANCE 0 0 NULL -EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME 0 0 NULL -EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME 0 0 NULL -FILE_INSTANCES 0 0 NULL -FILE_SUMMARY_BY_EVENT_NAME 0 0 NULL -FILE_SUMMARY_BY_INSTANCE 0 0 NULL -MUTEX_INSTANCES 0 0 NULL -PERFORMANCE_TIMERS 0 0 NULL -RWLOCK_INSTANCES 0 0 NULL -SETUP_CONSUMERS 0 0 NULL -SETUP_INSTRUMENTS 0 0 NULL -SETUP_TIMERS 0 0 NULL -THREADS 0 0 NULL -select upper(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME +lower(TABLE_NAME) INDEX_LENGTH DATA_FREE AUTO_INCREMENT +cond_instances 0 0 NULL +events_waits_current 0 0 NULL +events_waits_history 0 0 NULL +events_waits_history_long 0 0 NULL +events_waits_summary_by_instance 0 0 NULL +events_waits_summary_by_thread_by_event_name 0 0 NULL +events_waits_summary_global_by_event_name 0 0 NULL +file_instances 0 0 NULL +file_summary_by_event_name 0 0 NULL +file_summary_by_instance 0 0 NULL +mutex_instances 0 0 NULL +performance_timers 0 0 NULL +rwlock_instances 0 0 NULL +setup_consumers 0 0 NULL +setup_instruments 0 0 NULL +setup_timers 0 0 NULL +threads 0 0 NULL +select lower(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME from information_schema.tables where TABLE_SCHEMA='performance_schema'; -upper(TABLE_NAME) CREATE_TIME UPDATE_TIME CHECK_TIME -COND_INSTANCES NULL NULL NULL -EVENTS_WAITS_CURRENT NULL NULL NULL -EVENTS_WAITS_HISTORY NULL NULL NULL -EVENTS_WAITS_HISTORY_LONG NULL NULL NULL -EVENTS_WAITS_SUMMARY_BY_INSTANCE NULL NULL NULL -EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME NULL NULL NULL -EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME NULL NULL NULL -FILE_INSTANCES NULL NULL NULL -FILE_SUMMARY_BY_EVENT_NAME NULL NULL NULL -FILE_SUMMARY_BY_INSTANCE NULL NULL NULL -MUTEX_INSTANCES NULL NULL NULL -PERFORMANCE_TIMERS NULL NULL NULL -RWLOCK_INSTANCES NULL NULL NULL -SETUP_CONSUMERS NULL NULL NULL -SETUP_INSTRUMENTS NULL NULL NULL -SETUP_TIMERS NULL NULL NULL -THREADS NULL NULL NULL -select upper(TABLE_NAME), TABLE_COLLATION, CHECKSUM +lower(TABLE_NAME) CREATE_TIME UPDATE_TIME CHECK_TIME +cond_instances NULL NULL NULL +events_waits_current NULL NULL NULL +events_waits_history NULL NULL NULL +events_waits_history_long NULL NULL NULL +events_waits_summary_by_instance NULL NULL NULL +events_waits_summary_by_thread_by_event_name NULL NULL NULL +events_waits_summary_global_by_event_name NULL NULL NULL +file_instances NULL NULL NULL +file_summary_by_event_name NULL NULL NULL +file_summary_by_instance NULL NULL NULL +mutex_instances NULL NULL NULL +performance_timers NULL NULL NULL +rwlock_instances NULL NULL NULL +setup_consumers NULL NULL NULL +setup_instruments NULL NULL NULL +setup_timers NULL NULL NULL +threads NULL NULL NULL +select lower(TABLE_NAME), TABLE_COLLATION, CHECKSUM from information_schema.tables where TABLE_SCHEMA='performance_schema'; -upper(TABLE_NAME) TABLE_COLLATION CHECKSUM -COND_INSTANCES utf8_general_ci NULL -EVENTS_WAITS_CURRENT utf8_general_ci NULL -EVENTS_WAITS_HISTORY utf8_general_ci NULL -EVENTS_WAITS_HISTORY_LONG utf8_general_ci NULL -EVENTS_WAITS_SUMMARY_BY_INSTANCE utf8_general_ci NULL -EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME utf8_general_ci NULL -EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME utf8_general_ci NULL -FILE_INSTANCES utf8_general_ci NULL -FILE_SUMMARY_BY_EVENT_NAME utf8_general_ci NULL -FILE_SUMMARY_BY_INSTANCE utf8_general_ci NULL -MUTEX_INSTANCES utf8_general_ci NULL -PERFORMANCE_TIMERS utf8_general_ci NULL -RWLOCK_INSTANCES utf8_general_ci NULL -SETUP_CONSUMERS utf8_general_ci NULL -SETUP_INSTRUMENTS utf8_general_ci NULL -SETUP_TIMERS utf8_general_ci NULL -THREADS utf8_general_ci NULL -select upper(TABLE_NAME), TABLE_COMMENT +lower(TABLE_NAME) TABLE_COLLATION CHECKSUM +cond_instances utf8_general_ci NULL +events_waits_current utf8_general_ci NULL +events_waits_history utf8_general_ci NULL +events_waits_history_long utf8_general_ci NULL +events_waits_summary_by_instance utf8_general_ci NULL +events_waits_summary_by_thread_by_event_name utf8_general_ci NULL +events_waits_summary_global_by_event_name utf8_general_ci NULL +file_instances utf8_general_ci NULL +file_summary_by_event_name utf8_general_ci NULL +file_summary_by_instance utf8_general_ci NULL +mutex_instances utf8_general_ci NULL +performance_timers utf8_general_ci NULL +rwlock_instances utf8_general_ci NULL +setup_consumers utf8_general_ci NULL +setup_instruments utf8_general_ci NULL +setup_timers utf8_general_ci NULL +threads utf8_general_ci NULL +select lower(TABLE_NAME), TABLE_COMMENT from information_schema.tables where TABLE_SCHEMA='performance_schema'; -upper(TABLE_NAME) TABLE_COMMENT -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 +lower(TABLE_NAME) TABLE_COMMENT +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 diff --git a/mysql-test/suite/perfschema/r/misc.result b/mysql-test/suite/perfschema/r/misc.result index e389a4ce65c..4e9b08e00ef 100644 --- a/mysql-test/suite/perfschema/r/misc.result +++ b/mysql-test/suite/perfschema/r/misc.result @@ -1,13 +1,13 @@ -SELECT EVENT_ID FROM performance_schema.EVENTS_WAITS_CURRENT +SELECT EVENT_ID FROM performance_schema.events_waits_current WHERE THREAD_ID IN -(SELECT THREAD_ID FROM performance_schema.THREADS) +(SELECT THREAD_ID FROM performance_schema.threads) AND EVENT_NAME IN -(SELECT NAME FROM performance_schema.SETUP_INSTRUMENTS +(SELECT NAME FROM performance_schema.setup_instruments WHERE NAME LIKE "wait/synch/%") LIMIT 1; create table test.t1(a int) engine=performance_schema; ERROR HY000: Invalid performance_schema usage. -create table test.t1 like performance_schema.EVENTS_WAITS_CURRENT; +create table test.t1 like performance_schema.events_waits_current; ERROR HY000: Invalid performance_schema usage. create table performance_schema.t1(a int); ERROR 42000: CREATE command denied to user 'root'@'localhost' for table 't1' @@ -22,7 +22,7 @@ a b 1 3 2 4 drop table test.ghost; -select * from performance_schema.FILE_INSTANCES +select * from performance_schema.file_instances where file_name like "%ghost%"; FILE_NAME EVENT_NAME OPEN_COUNT select * from performance_schema.no_such_table; diff --git a/mysql-test/suite/perfschema/r/myisam_file_io.result b/mysql-test/suite/perfschema/r/myisam_file_io.result index 5d710d9183d..287abd43d74 100644 --- a/mysql-test/suite/perfschema/r/myisam_file_io.result +++ b/mysql-test/suite/perfschema/r/myisam_file_io.result @@ -1,9 +1,9 @@ -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/file/myisam/%"; -update performance_schema.SETUP_CONSUMERS +update performance_schema.setup_consumers set enabled='YES'; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_history_long; flush status; drop table if exists test.no_index_tab; create table test.no_index_tab ( a varchar(255), b int ) engine=myisam; @@ -14,7 +14,7 @@ select event_name, left(source, locate(":", source)) as short_source, operation, number_of_bytes, substring(object_name, locate("no_index_tab", object_name)) as short_name -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where operation not like "tell" order by thread_id, event_id; event_name short_source operation number_of_bytes short_name @@ -56,5 +56,5 @@ Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; drop table test.no_index_tab; diff --git a/mysql-test/suite/perfschema/r/no_threads.result b/mysql-test/suite/perfschema/r/no_threads.result index 79d16809eee..89ae72c8df1 100644 --- a/mysql-test/suite/perfschema/r/no_threads.result +++ b/mysql-test/suite/perfschema/r/no_threads.result @@ -1,11 +1,11 @@ -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_consumers set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/synch/mutex/mysys/THR_LOCK_myisam"; drop table if exists test.t1; -truncate table performance_schema.EVENTS_WAITS_CURRENT; -truncate table performance_schema.EVENTS_WAITS_HISTORY; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_current; +truncate table performance_schema.events_waits_history; +truncate table performance_schema.events_waits_history_long; show variables like "thread_handling"; Variable_name Value thread_handling no-threads @@ -17,27 +17,27 @@ show variables like "performance_schema_max_thread%"; Variable_name Value performance_schema_max_thread_classes 50 performance_schema_max_thread_instances 10 -select count(*) from performance_schema.THREADS +select count(*) from performance_schema.threads where name like "thread/sql/main"; count(*) 1 -select count(*) from performance_schema.THREADS +select count(*) from performance_schema.threads where name like "thread/sql/OneConnection"; count(*) 0 select event_name, operation, left(source, locate(":", source)) as short_source -from performance_schema.EVENTS_WAITS_CURRENT; +from performance_schema.events_waits_current; event_name operation short_source wait/synch/mutex/mysys/THR_LOCK_myisam lock mi_create.c: select event_name, operation, left(source, locate(":", source)) as short_source -from performance_schema.EVENTS_WAITS_HISTORY; +from performance_schema.events_waits_history; event_name operation short_source wait/synch/mutex/mysys/THR_LOCK_myisam lock mi_create.c: select event_name, operation, left(source, locate(":", source)) as short_source -from performance_schema.EVENTS_WAITS_HISTORY_LONG; +from performance_schema.events_waits_history_long; event_name operation short_source wait/synch/mutex/mysys/THR_LOCK_myisam lock mi_create.c: drop table test.t1; diff --git a/mysql-test/suite/perfschema/r/one_thread_per_con.result b/mysql-test/suite/perfschema/r/one_thread_per_con.result index 9677a09933a..998aba6281c 100644 --- a/mysql-test/suite/perfschema/r/one_thread_per_con.result +++ b/mysql-test/suite/perfschema/r/one_thread_per_con.result @@ -1,9 +1,9 @@ -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_instruments set enabled='YES' where name like "wait/synch/mutex/mysys/THR_LOCK_myisam"; drop table if exists test.t1; drop table if exists test.t2; drop table if exists test.t3; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_history_long; show variables like "thread_handling"; Variable_name Value thread_handling one-thread-per-connection @@ -35,4 +35,4 @@ thread/sql/one_connection drop table test.t1; drop table test.t2; drop table test.t3; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/privilege.result b/mysql-test/suite/perfschema/r/privilege.result index 4283b250cee..61f5adac354 100644 --- a/mysql-test/suite/perfschema/r/privilege.result +++ b/mysql-test/suite/perfschema/r/privilege.result @@ -35,102 +35,102 @@ grant INSERT on performance_schema.* to 'pfs_user_2'@localhost; grant UPDATE on performance_schema.* to 'pfs_user_2'@localhost; grant DELETE on performance_schema.* to 'pfs_user_2'@localhost; grant LOCK TABLES on performance_schema.* to 'pfs_user_2'@localhost; -grant ALL on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost +grant ALL on performance_schema.setup_instruments to 'pfs_user_3'@localhost with GRANT OPTION; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant CREATE on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; -grant DROP on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; -grant REFERENCES on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant CREATE on performance_schema.setup_instruments to 'pfs_user_3'@localhost; +grant DROP on performance_schema.setup_instruments to 'pfs_user_3'@localhost; +grant REFERENCES on performance_schema.setup_instruments to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant INDEX on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant INDEX on performance_schema.setup_instruments to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant ALTER on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant ALTER on performance_schema.setup_instruments to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant CREATE VIEW on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant CREATE VIEW on performance_schema.setup_instruments to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant SHOW VIEW on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant SHOW VIEW on performance_schema.setup_instruments to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant TRIGGER on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant TRIGGER on performance_schema.setup_instruments to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant INSERT on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; -ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' -grant DELETE on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; -ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' -grant SELECT on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost +grant INSERT on performance_schema.setup_instruments to 'pfs_user_3'@localhost; +ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'setup_instruments' +grant DELETE on performance_schema.setup_instruments to 'pfs_user_3'@localhost; +ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'setup_instruments' +grant SELECT on performance_schema.setup_instruments to 'pfs_user_3'@localhost with GRANT OPTION; -grant UPDATE on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost +grant UPDATE on performance_schema.setup_instruments to 'pfs_user_3'@localhost with GRANT OPTION; -grant ALL on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost +grant ALL on performance_schema.events_waits_current to 'pfs_user_3'@localhost with GRANT OPTION; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant CREATE on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; -grant DROP on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; -grant REFERENCES on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant CREATE on performance_schema.events_waits_current to 'pfs_user_3'@localhost; +grant DROP on performance_schema.events_waits_current to 'pfs_user_3'@localhost; +grant REFERENCES on performance_schema.events_waits_current to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant INDEX on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant INDEX on performance_schema.events_waits_current to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant ALTER on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant ALTER on performance_schema.events_waits_current to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant CREATE VIEW on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant CREATE VIEW on performance_schema.events_waits_current to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant SHOW VIEW on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant SHOW VIEW on performance_schema.events_waits_current to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant TRIGGER on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant TRIGGER on performance_schema.events_waits_current to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant INSERT on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; -ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' -grant UPDATE on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; -ERROR 42000: UPDATE,GRANT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' -grant DELETE on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; -ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' -grant SELECT on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost +grant INSERT on performance_schema.events_waits_current to 'pfs_user_3'@localhost; +ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'events_waits_current' +grant UPDATE on performance_schema.events_waits_current to 'pfs_user_3'@localhost; +ERROR 42000: UPDATE,GRANT command denied to user 'root'@'localhost' for table 'events_waits_current' +grant DELETE on performance_schema.events_waits_current to 'pfs_user_3'@localhost; +ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'events_waits_current' +grant SELECT on performance_schema.events_waits_current to 'pfs_user_3'@localhost with GRANT OPTION; -grant ALL on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost +grant ALL on performance_schema.file_instances to 'pfs_user_3'@localhost with GRANT OPTION; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant CREATE on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; -grant DROP on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; -grant REFERENCES on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant CREATE on performance_schema.file_instances to 'pfs_user_3'@localhost; +grant DROP on performance_schema.file_instances to 'pfs_user_3'@localhost; +grant REFERENCES on performance_schema.file_instances to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant INDEX on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant INDEX on performance_schema.file_instances to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant ALTER on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant ALTER on performance_schema.file_instances to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant CREATE VIEW on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant CREATE VIEW on performance_schema.file_instances to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant SHOW VIEW on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant SHOW VIEW on performance_schema.file_instances to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant TRIGGER on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant TRIGGER on performance_schema.file_instances to 'pfs_user_3'@localhost; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -grant INSERT on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; -ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' -grant UPDATE on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; -ERROR 42000: UPDATE,GRANT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' -grant DELETE on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; -ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' -grant SELECT on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost +grant INSERT on performance_schema.file_instances to 'pfs_user_3'@localhost; +ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'file_instances' +grant UPDATE on performance_schema.file_instances to 'pfs_user_3'@localhost; +ERROR 42000: UPDATE,GRANT command denied to user 'root'@'localhost' for table 'file_instances' +grant DELETE on performance_schema.file_instances to 'pfs_user_3'@localhost; +ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'file_instances' +grant SELECT on performance_schema.file_instances to 'pfs_user_3'@localhost with GRANT OPTION; grant LOCK TABLES on performance_schema.* to 'pfs_user_3'@localhost with GRANT OPTION; flush privileges; drop table if exists test.t1; -rename table performance_schema.SETUP_INSTRUMENTS to test.t1; +rename table performance_schema.setup_instruments to test.t1; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -rename table performance_schema.EVENTS_WAITS_CURRENT to test.t1; +rename table performance_schema.events_waits_current to test.t1; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -rename table performance_schema.FILE_INSTANCES to test.t1; +rename table performance_schema.file_instances to test.t1; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -rename table performance_schema.SETUP_INSTRUMENTS to performance_schema.t1; +rename table performance_schema.setup_instruments to performance_schema.t1; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -rename table performance_schema.EVENTS_WAITS_CURRENT to performance_schema.t1; +rename table performance_schema.events_waits_current to performance_schema.t1; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -rename table performance_schema.FILE_INSTANCES to performance_schema.t1; +rename table performance_schema.file_instances to performance_schema.t1; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -rename table performance_schema.SETUP_INSTRUMENTS -to performance_schema.EVENTS_WAITS_CURRENT; +rename table performance_schema.setup_instruments +to performance_schema.events_waits_current; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' -rename table performance_schema.EVENTS_WAITS_CURRENT -to performance_schema.SETUP_INSTRUMENTS; +rename table performance_schema.events_waits_current +to performance_schema.setup_instruments; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' create procedure performance_schema.my_proc() begin end; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' @@ -140,95 +140,95 @@ create event performance_schema.my_event on schedule every 15 minute do begin end; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' create trigger performance_schema.bi_setup_instruments -before insert on performance_schema.SETUP_INSTRUMENTS +before insert on performance_schema.setup_instruments for each row begin end; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' create trigger performance_schema.bi_events_waits_current -before insert on performance_schema.EVENTS_WAITS_CURRENT +before insert on performance_schema.events_waits_current for each row begin end; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' create trigger performance_schema.bi_file_instances -before insert on performance_schema.FILE_INSTANCES +before insert on performance_schema.file_instances for each row begin end; ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' create table test.t1(a int) engine=PERFORMANCE_SCHEMA; ERROR HY000: Invalid performance_schema usage. -create table test.t1 like performance_schema.SETUP_INSTRUMENTS; +create table test.t1 like performance_schema.setup_instruments; ERROR HY000: Invalid performance_schema usage. -create table test.t1 like performance_schema.EVENTS_WAITS_CURRENT; +create table test.t1 like performance_schema.events_waits_current; ERROR HY000: Invalid performance_schema usage. -create table test.t1 like performance_schema.FILE_INSTANCES; +create table test.t1 like performance_schema.file_instances; ERROR HY000: Invalid performance_schema usage. -insert into performance_schema.SETUP_INSTRUMENTS +insert into performance_schema.setup_instruments set name="foo"; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' -insert into performance_schema.EVENTS_WAITS_CURRENT +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments' +insert into performance_schema.events_waits_current set name="foo"; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' -insert into performance_schema.FILE_INSTANCES +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_current' +insert into performance_schema.file_instances set name="foo"; -ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' -delete from performance_schema.SETUP_INSTRUMENTS; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' -delete from performance_schema.EVENTS_WAITS_CURRENT; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' -delete from performance_schema.FILE_INSTANCES; -ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' -lock table performance_schema.SETUP_INSTRUMENTS read; +ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_instances' +delete from performance_schema.setup_instruments; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_instruments' +delete from performance_schema.events_waits_current; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_current' +delete from performance_schema.file_instances; +ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_instances' +lock table performance_schema.setup_instruments read; unlock tables; -lock table performance_schema.SETUP_INSTRUMENTS write; +lock table performance_schema.setup_instruments write; unlock tables; -lock table performance_schema.EVENTS_WAITS_CURRENT read; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' +lock table performance_schema.events_waits_current read; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current' unlock tables; -lock table performance_schema.EVENTS_WAITS_CURRENT write; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' +lock table performance_schema.events_waits_current write; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current' unlock tables; -lock table performance_schema.FILE_INSTANCES read; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' +lock table performance_schema.file_instances read; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances' unlock tables; -lock table performance_schema.FILE_INSTANCES write; -ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' +lock table performance_schema.file_instances write; +ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances' unlock tables; # # WL#4818, NFS2: Can use grants to give normal user access -# to view data from _CURRENT and _HISTORY tables +# to view data from _current and _history tables # # Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3. -# (Except for EVENTS_WAITS_CURRENT, which is granted.) -SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY LIMIT 1; +# (Except for events_waits_current, which is granted.) +SELECT "can select" FROM performance_schema.events_waits_history LIMIT 1; can select can select -SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY_LONG LIMIT 1; +SELECT "can select" FROM performance_schema.events_waits_history_long LIMIT 1; can select can select -SELECT "can select" FROM performance_schema.EVENTS_WAITS_CURRENT LIMIT 1; +SELECT "can select" FROM performance_schema.events_waits_current LIMIT 1; can select can select -SELECT "can select" FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE LIMIT 1; +SELECT "can select" FROM performance_schema.events_waits_summary_by_instance LIMIT 1; can select can select -SELECT "can select" FROM performance_schema.FILE_SUMMARY_BY_INSTANCE LIMIT 1; +SELECT "can select" FROM performance_schema.file_summary_by_instance LIMIT 1; can select can select drop table if exists test.t1; -rename table performance_schema.SETUP_INSTRUMENTS to test.t1; +rename table performance_schema.setup_instruments to test.t1; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' -rename table performance_schema.EVENTS_WAITS_CURRENT to test.t1; +rename table performance_schema.events_waits_current to test.t1; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' -rename table performance_schema.FILE_INSTANCES to test.t1; +rename table performance_schema.file_instances to test.t1; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' -rename table performance_schema.SETUP_INSTRUMENTS to performance_schema.t1; +rename table performance_schema.setup_instruments to performance_schema.t1; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' -rename table performance_schema.EVENTS_WAITS_CURRENT to performance_schema.t1; +rename table performance_schema.events_waits_current to performance_schema.t1; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' -rename table performance_schema.FILE_INSTANCES to performance_schema.t1; +rename table performance_schema.file_instances to performance_schema.t1; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' -rename table performance_schema.SETUP_INSTRUMENTS -to performance_schema.EVENTS_WAITS_CURRENT; +rename table performance_schema.setup_instruments +to performance_schema.events_waits_current; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' -rename table performance_schema.EVENTS_WAITS_CURRENT -to performance_schema.SETUP_INSTRUMENTS; +rename table performance_schema.events_waits_current +to performance_schema.setup_instruments; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' create procedure performance_schema.my_proc() begin end; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' @@ -238,95 +238,95 @@ create event performance_schema.my_event on schedule every 15 minute do begin end; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' create trigger performance_schema.bi_setup_instruments -before insert on performance_schema.SETUP_INSTRUMENTS +before insert on performance_schema.setup_instruments for each row begin end; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' create trigger performance_schema.bi_events_waits_current -before insert on performance_schema.EVENTS_WAITS_CURRENT +before insert on performance_schema.events_waits_current for each row begin end; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' create trigger performance_schema.bi_file_instances -before insert on performance_schema.FILE_INSTANCES +before insert on performance_schema.file_instances for each row begin end; ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' create table test.t1(a int) engine=PERFORMANCE_SCHEMA; ERROR HY000: Invalid performance_schema usage. -create table test.t1 like performance_schema.SETUP_INSTRUMENTS; +create table test.t1 like performance_schema.setup_instruments; ERROR HY000: Invalid performance_schema usage. -create table test.t1 like performance_schema.EVENTS_WAITS_CURRENT; +create table test.t1 like performance_schema.events_waits_current; ERROR HY000: Invalid performance_schema usage. -create table test.t1 like performance_schema.FILE_INSTANCES; +create table test.t1 like performance_schema.file_instances; ERROR HY000: Invalid performance_schema usage. -insert into performance_schema.SETUP_INSTRUMENTS +insert into performance_schema.setup_instruments set name="foo"; -ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'SETUP_INSTRUMENTS' -insert into performance_schema.EVENTS_WAITS_CURRENT +ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments' +insert into performance_schema.events_waits_current set name="foo"; -ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'EVENTS_WAITS_CURRENT' -insert into performance_schema.FILE_INSTANCES +ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current' +insert into performance_schema.file_instances set name="foo"; -ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'FILE_INSTANCES' -delete from performance_schema.SETUP_INSTRUMENTS; -ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'SETUP_INSTRUMENTS' -delete from performance_schema.EVENTS_WAITS_CURRENT; -ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'EVENTS_WAITS_CURRENT' -delete from performance_schema.FILE_INSTANCES; -ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'FILE_INSTANCES' -lock table performance_schema.SETUP_INSTRUMENTS read; +ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'file_instances' +delete from performance_schema.setup_instruments; +ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments' +delete from performance_schema.events_waits_current; +ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current' +delete from performance_schema.file_instances; +ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'file_instances' +lock table performance_schema.setup_instruments read; unlock tables; -lock table performance_schema.SETUP_INSTRUMENTS write; +lock table performance_schema.setup_instruments write; unlock tables; -lock table performance_schema.EVENTS_WAITS_CURRENT read; -ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'EVENTS_WAITS_CURRENT' +lock table performance_schema.events_waits_current read; +ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current' unlock tables; -lock table performance_schema.EVENTS_WAITS_CURRENT write; -ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'EVENTS_WAITS_CURRENT' +lock table performance_schema.events_waits_current write; +ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current' unlock tables; -lock table performance_schema.FILE_INSTANCES read; -ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'FILE_INSTANCES' +lock table performance_schema.file_instances read; +ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'file_instances' unlock tables; -lock table performance_schema.FILE_INSTANCES write; -ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'FILE_INSTANCES' +lock table performance_schema.file_instances write; +ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'file_instances' unlock tables; # # WL#4818, NFS2: Can use grants to give normal user access -# to view data from _CURRENT and _HISTORY tables +# to view data from _current and _history tables # # Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3. -# (Except for EVENTS_WAITS_CURRENT, which is granted.) -SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY LIMIT 1; +# (Except for events_waits_current, which is granted.) +SELECT "can select" FROM performance_schema.events_waits_history LIMIT 1; can select can select -SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY_LONG LIMIT 1; +SELECT "can select" FROM performance_schema.events_waits_history_long LIMIT 1; can select can select -SELECT "can select" FROM performance_schema.EVENTS_WAITS_CURRENT LIMIT 1; +SELECT "can select" FROM performance_schema.events_waits_current LIMIT 1; can select can select -SELECT "can select" FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE LIMIT 1; +SELECT "can select" FROM performance_schema.events_waits_summary_by_instance LIMIT 1; can select can select -SELECT "can select" FROM performance_schema.FILE_SUMMARY_BY_INSTANCE LIMIT 1; +SELECT "can select" FROM performance_schema.file_summary_by_instance LIMIT 1; can select can select drop table if exists test.t1; -rename table performance_schema.SETUP_INSTRUMENTS to test.t1; +rename table performance_schema.setup_instruments to test.t1; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' -rename table performance_schema.EVENTS_WAITS_CURRENT to test.t1; +rename table performance_schema.events_waits_current to test.t1; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' -rename table performance_schema.FILE_INSTANCES to test.t1; +rename table performance_schema.file_instances to test.t1; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' -rename table performance_schema.SETUP_INSTRUMENTS to performance_schema.t1; +rename table performance_schema.setup_instruments to performance_schema.t1; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' -rename table performance_schema.EVENTS_WAITS_CURRENT to performance_schema.t1; +rename table performance_schema.events_waits_current to performance_schema.t1; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' -rename table performance_schema.FILE_INSTANCES to performance_schema.t1; +rename table performance_schema.file_instances to performance_schema.t1; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' -rename table performance_schema.SETUP_INSTRUMENTS -to performance_schema.EVENTS_WAITS_CURRENT; +rename table performance_schema.setup_instruments +to performance_schema.events_waits_current; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' -rename table performance_schema.EVENTS_WAITS_CURRENT -to performance_schema.SETUP_INSTRUMENTS; +rename table performance_schema.events_waits_current +to performance_schema.setup_instruments; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' create procedure performance_schema.my_proc() begin end; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' @@ -336,95 +336,95 @@ create event performance_schema.my_event on schedule every 15 minute do begin end; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' create trigger performance_schema.bi_setup_instruments -before insert on performance_schema.SETUP_INSTRUMENTS +before insert on performance_schema.setup_instruments for each row begin end; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' create trigger performance_schema.bi_events_waits_current -before insert on performance_schema.EVENTS_WAITS_CURRENT +before insert on performance_schema.events_waits_current for each row begin end; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' create trigger performance_schema.bi_file_instances -before insert on performance_schema.FILE_INSTANCES +before insert on performance_schema.file_instances for each row begin end; ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' create table test.t1(a int) engine=PERFORMANCE_SCHEMA; ERROR HY000: Invalid performance_schema usage. -create table test.t1 like performance_schema.SETUP_INSTRUMENTS; +create table test.t1 like performance_schema.setup_instruments; ERROR HY000: Invalid performance_schema usage. -create table test.t1 like performance_schema.EVENTS_WAITS_CURRENT; +create table test.t1 like performance_schema.events_waits_current; ERROR HY000: Invalid performance_schema usage. -create table test.t1 like performance_schema.FILE_INSTANCES; +create table test.t1 like performance_schema.file_instances; ERROR HY000: Invalid performance_schema usage. -insert into performance_schema.SETUP_INSTRUMENTS +insert into performance_schema.setup_instruments set name="foo"; -ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'SETUP_INSTRUMENTS' -insert into performance_schema.EVENTS_WAITS_CURRENT +ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments' +insert into performance_schema.events_waits_current set name="foo"; -ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'EVENTS_WAITS_CURRENT' -insert into performance_schema.FILE_INSTANCES +ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current' +insert into performance_schema.file_instances set name="foo"; -ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'FILE_INSTANCES' -delete from performance_schema.SETUP_INSTRUMENTS; -ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'SETUP_INSTRUMENTS' -delete from performance_schema.EVENTS_WAITS_CURRENT; -ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'EVENTS_WAITS_CURRENT' -delete from performance_schema.FILE_INSTANCES; -ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'FILE_INSTANCES' -lock table performance_schema.SETUP_INSTRUMENTS read; +ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'file_instances' +delete from performance_schema.setup_instruments; +ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments' +delete from performance_schema.events_waits_current; +ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current' +delete from performance_schema.file_instances; +ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'file_instances' +lock table performance_schema.setup_instruments read; unlock tables; -lock table performance_schema.SETUP_INSTRUMENTS write; +lock table performance_schema.setup_instruments write; unlock tables; -lock table performance_schema.EVENTS_WAITS_CURRENT read; -ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'EVENTS_WAITS_CURRENT' +lock table performance_schema.events_waits_current read; +ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current' unlock tables; -lock table performance_schema.EVENTS_WAITS_CURRENT write; -ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'EVENTS_WAITS_CURRENT' +lock table performance_schema.events_waits_current write; +ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current' unlock tables; -lock table performance_schema.FILE_INSTANCES read; -ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'FILE_INSTANCES' +lock table performance_schema.file_instances read; +ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'file_instances' unlock tables; -lock table performance_schema.FILE_INSTANCES write; -ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'FILE_INSTANCES' +lock table performance_schema.file_instances write; +ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'file_instances' unlock tables; # # WL#4818, NFS2: Can use grants to give normal user access -# to view data from _CURRENT and _HISTORY tables +# to view data from _current and _history tables # # Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3. -# (Except for EVENTS_WAITS_CURRENT, which is granted.) -SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY LIMIT 1; +# (Except for events_waits_current, which is granted.) +SELECT "can select" FROM performance_schema.events_waits_history LIMIT 1; can select can select -SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY_LONG LIMIT 1; +SELECT "can select" FROM performance_schema.events_waits_history_long LIMIT 1; can select can select -SELECT "can select" FROM performance_schema.EVENTS_WAITS_CURRENT LIMIT 1; +SELECT "can select" FROM performance_schema.events_waits_current LIMIT 1; can select can select -SELECT "can select" FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE LIMIT 1; +SELECT "can select" FROM performance_schema.events_waits_summary_by_instance LIMIT 1; can select can select -SELECT "can select" FROM performance_schema.FILE_SUMMARY_BY_INSTANCE LIMIT 1; +SELECT "can select" FROM performance_schema.file_summary_by_instance LIMIT 1; can select can select drop table if exists test.t1; -rename table performance_schema.SETUP_INSTRUMENTS to test.t1; +rename table performance_schema.setup_instruments to test.t1; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' -rename table performance_schema.EVENTS_WAITS_CURRENT to test.t1; +rename table performance_schema.events_waits_current to test.t1; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' -rename table performance_schema.FILE_INSTANCES to test.t1; +rename table performance_schema.file_instances to test.t1; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' -rename table performance_schema.SETUP_INSTRUMENTS to performance_schema.t1; +rename table performance_schema.setup_instruments to performance_schema.t1; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' -rename table performance_schema.EVENTS_WAITS_CURRENT to performance_schema.t1; +rename table performance_schema.events_waits_current to performance_schema.t1; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' -rename table performance_schema.FILE_INSTANCES to performance_schema.t1; +rename table performance_schema.file_instances to performance_schema.t1; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' -rename table performance_schema.SETUP_INSTRUMENTS -to performance_schema.EVENTS_WAITS_CURRENT; +rename table performance_schema.setup_instruments +to performance_schema.events_waits_current; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' -rename table performance_schema.EVENTS_WAITS_CURRENT -to performance_schema.SETUP_INSTRUMENTS; +rename table performance_schema.events_waits_current +to performance_schema.setup_instruments; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' create procedure performance_schema.my_proc() begin end; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' @@ -434,73 +434,73 @@ create event performance_schema.my_event on schedule every 15 minute do begin end; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' create trigger performance_schema.bi_setup_instruments -before insert on performance_schema.SETUP_INSTRUMENTS +before insert on performance_schema.setup_instruments for each row begin end; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' create trigger performance_schema.bi_events_waits_current -before insert on performance_schema.EVENTS_WAITS_CURRENT +before insert on performance_schema.events_waits_current for each row begin end; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' create trigger performance_schema.bi_file_instances -before insert on performance_schema.FILE_INSTANCES +before insert on performance_schema.file_instances for each row begin end; ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' create table test.t1(a int) engine=PERFORMANCE_SCHEMA; ERROR HY000: Invalid performance_schema usage. -create table test.t1 like performance_schema.SETUP_INSTRUMENTS; +create table test.t1 like performance_schema.setup_instruments; ERROR HY000: Invalid performance_schema usage. -create table test.t1 like performance_schema.EVENTS_WAITS_CURRENT; +create table test.t1 like performance_schema.events_waits_current; ERROR HY000: Invalid performance_schema usage. -create table test.t1 like performance_schema.FILE_INSTANCES; +create table test.t1 like performance_schema.file_instances; ERROR HY000: Invalid performance_schema usage. -insert into performance_schema.SETUP_INSTRUMENTS +insert into performance_schema.setup_instruments set name="foo"; -ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'SETUP_INSTRUMENTS' -insert into performance_schema.EVENTS_WAITS_CURRENT +ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments' +insert into performance_schema.events_waits_current set name="foo"; -ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_CURRENT' -insert into performance_schema.FILE_INSTANCES +ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current' +insert into performance_schema.file_instances set name="foo"; -ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'FILE_INSTANCES' -delete from performance_schema.SETUP_INSTRUMENTS; -ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'SETUP_INSTRUMENTS' -delete from performance_schema.EVENTS_WAITS_CURRENT; -ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_CURRENT' -delete from performance_schema.FILE_INSTANCES; -ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'FILE_INSTANCES' -lock table performance_schema.SETUP_INSTRUMENTS read; +ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'file_instances' +delete from performance_schema.setup_instruments; +ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments' +delete from performance_schema.events_waits_current; +ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current' +delete from performance_schema.file_instances; +ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'file_instances' +lock table performance_schema.setup_instruments read; unlock tables; -lock table performance_schema.SETUP_INSTRUMENTS write; +lock table performance_schema.setup_instruments write; unlock tables; -lock table performance_schema.EVENTS_WAITS_CURRENT read; -ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_CURRENT' +lock table performance_schema.events_waits_current read; +ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current' unlock tables; -lock table performance_schema.EVENTS_WAITS_CURRENT write; -ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_CURRENT' +lock table performance_schema.events_waits_current write; +ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current' unlock tables; -lock table performance_schema.FILE_INSTANCES read; -ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'FILE_INSTANCES' +lock table performance_schema.file_instances read; +ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'file_instances' unlock tables; -lock table performance_schema.FILE_INSTANCES write; -ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'FILE_INSTANCES' +lock table performance_schema.file_instances write; +ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'file_instances' unlock tables; # # WL#4818, NFS2: Can use grants to give normal user access -# to view data from _CURRENT and _HISTORY tables +# to view data from _current and _history tables # # Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3. -# (Except for EVENTS_WAITS_CURRENT, which is granted.) -SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY LIMIT 1; -ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_HISTORY' -SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY_LONG LIMIT 1; -ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' -SELECT "can select" FROM performance_schema.EVENTS_WAITS_CURRENT LIMIT 1; -can select -can select -SELECT "can select" FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE LIMIT 1; -ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' -SELECT "can select" FROM performance_schema.FILE_SUMMARY_BY_INSTANCE LIMIT 1; -ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' +# (Except for events_waits_current, which is granted.) +SELECT "can select" FROM performance_schema.events_waits_history LIMIT 1; +ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_history' +SELECT "can select" FROM performance_schema.events_waits_history_long LIMIT 1; +ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_history_long' +SELECT "can select" FROM performance_schema.events_waits_current LIMIT 1; +can select +can select +SELECT "can select" FROM performance_schema.events_waits_summary_by_instance LIMIT 1; +ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_summary_by_instance' +SELECT "can select" FROM performance_schema.file_summary_by_instance LIMIT 1; +ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'file_summary_by_instance' revoke all privileges, grant option from 'pfs_user_1'@localhost; revoke all privileges, grant option from 'pfs_user_2'@localhost; revoke all privileges, grant option from 'pfs_user_3'@localhost; @@ -516,63 +516,63 @@ CREATE user pfs_user_4; # without grants # # Select as pfs_user_4 should fail without grant -SELECT event_id FROM performance_schema.EVENTS_WAITS_HISTORY; -ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_HISTORY' -SELECT event_id FROM performance_schema.EVENTS_WAITS_HISTORY_LONG; -ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' -SELECT event_id FROM performance_schema.EVENTS_WAITS_CURRENT; -ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_CURRENT' -SELECT event_name FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' -SELECT event_name FROM performance_schema.FILE_SUMMARY_BY_INSTANCE; -ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' +SELECT event_id FROM performance_schema.events_waits_history; +ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history' +SELECT event_id FROM performance_schema.events_waits_history_long; +ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history_long' +SELECT event_id FROM performance_schema.events_waits_current; +ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_current' +SELECT event_name FROM performance_schema.events_waits_summary_by_instance; +ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_summary_by_instance' +SELECT event_name FROM performance_schema.file_summary_by_instance; +ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'file_summary_by_instance' # # WL#4818, NFS3: Normal user does not have access to change what is # instrumented without grants # # User pfs_user_4 should not be allowed to tweak instrumentation without # explicit grant -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO', timed = 'YES'; -ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'SETUP_INSTRUMENTS' -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' +UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES'; +ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_instruments' +UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/synch/mutex/%' OR name LIKE 'wait/synch/rwlock/%'; -ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'SETUP_INSTRUMENTS' -UPDATE performance_schema.SETUP_CONSUMERS SET enabled = 'YES'; -ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'SETUP_CONSUMERS' -UPDATE performance_schema.SETUP_TIMERS SET timer_name = 'TICK'; -ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'SETUP_TIMERS' -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_HISTORY' -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; -ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_CURRENT' +ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_instruments' +UPDATE performance_schema.setup_consumers SET enabled = 'YES'; +ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_consumers' +UPDATE performance_schema.setup_timers SET timer_name = 'TICK'; +ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_timers' +TRUNCATE TABLE performance_schema.events_waits_history_long; +ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history_long' +TRUNCATE TABLE performance_schema.events_waits_history; +ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history' +TRUNCATE TABLE performance_schema.events_waits_current; +ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_current' # # WL#4814, NFS1: Can use grants to give normal user access # to turn on and off instrumentation # # Grant access to change tables with the root account -GRANT UPDATE ON performance_schema.SETUP_CONSUMERS TO pfs_user_4; -GRANT UPDATE ON performance_schema.SETUP_TIMERS TO pfs_user_4; -GRANT UPDATE, SELECT ON performance_schema.SETUP_INSTRUMENTS TO pfs_user_4; -GRANT DROP ON performance_schema.EVENTS_WAITS_CURRENT TO pfs_user_4; -GRANT DROP ON performance_schema.EVENTS_WAITS_HISTORY TO pfs_user_4; -GRANT DROP ON performance_schema.EVENTS_WAITS_HISTORY_LONG TO pfs_user_4; +GRANT UPDATE ON performance_schema.setup_consumers TO pfs_user_4; +GRANT UPDATE ON performance_schema.setup_timers TO pfs_user_4; +GRANT UPDATE, SELECT ON performance_schema.setup_instruments TO pfs_user_4; +GRANT DROP ON performance_schema.events_waits_current TO pfs_user_4; +GRANT DROP ON performance_schema.events_waits_history TO pfs_user_4; +GRANT DROP ON performance_schema.events_waits_history_long TO pfs_user_4; # User pfs_user_4 should now be allowed to tweak instrumentation -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO', timed = 'YES'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' +UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES'; +UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/synch/mutex/%' OR name LIKE 'wait/synch/rwlock/%'; -UPDATE performance_schema.SETUP_CONSUMERS SET enabled = 'YES'; -UPDATE performance_schema.SETUP_TIMERS SET timer_name = 'TICK'; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +UPDATE performance_schema.setup_consumers SET enabled = 'YES'; +UPDATE performance_schema.setup_timers SET timer_name = 'TICK'; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; # Clean up REVOKE ALL PRIVILEGES, GRANT OPTION FROM pfs_user_4; DROP USER pfs_user_4; flush privileges; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES'; -UPDATE performance_schema.SETUP_CONSUMERS SET enabled = 'YES'; -UPDATE performance_schema.SETUP_TIMERS SET timer_name = 'CYCLE'; +UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; +UPDATE performance_schema.setup_consumers SET enabled = 'YES'; +UPDATE performance_schema.setup_timers SET timer_name = 'CYCLE'; diff --git a/mysql-test/suite/perfschema/r/query_cache.result b/mysql-test/suite/perfschema/r/query_cache.result index a0aeac5a916..c7ac3d499b4 100644 --- a/mysql-test/suite/perfschema/r/query_cache.result +++ b/mysql-test/suite/perfschema/r/query_cache.result @@ -33,10 +33,10 @@ Qcache_inserts 1 show status like "Qcache_hits"; Variable_name Value Qcache_hits 1 -select spins from performance_schema.EVENTS_WAITS_CURRENT order by event_name limit 1; +select spins from performance_schema.events_waits_current order by event_name limit 1; spins NULL -select name from performance_schema.SETUP_INSTRUMENTS order by name limit 1; +select name from performance_schema.setup_instruments order by name limit 1; name wait/io/file/csv/data show status like "Qcache_queries_in_cache"; @@ -48,10 +48,10 @@ Qcache_inserts 1 show status like "Qcache_hits"; Variable_name Value Qcache_hits 1 -select spins from performance_schema.EVENTS_WAITS_CURRENT order by event_name limit 1; +select spins from performance_schema.events_waits_current order by event_name limit 1; spins NULL -select name from performance_schema.SETUP_INSTRUMENTS order by name limit 1; +select name from performance_schema.setup_instruments order by name limit 1; name wait/io/file/csv/data show status like "Qcache_queries_in_cache"; diff --git a/mysql-test/suite/perfschema/r/read_only.result b/mysql-test/suite/perfschema/r/read_only.result index 6a30eb4ab8b..19108326f1b 100644 --- a/mysql-test/suite/perfschema/r/read_only.result +++ b/mysql-test/suite/perfschema/r/read_only.result @@ -13,9 +13,9 @@ show grants; Grants for pfsuser@localhost GRANT USAGE ON *.* TO 'pfsuser'@'localhost' GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost' -select * from performance_schema.SETUP_INSTRUMENTS; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +select * from performance_schema.setup_instruments; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES'; connection default; set global read_only=1; connection con1; @@ -26,9 +26,9 @@ show grants; Grants for pfsuser@localhost GRANT USAGE ON *.* TO 'pfsuser'@'localhost' GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost' -select * from performance_schema.SETUP_INSTRUMENTS; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +select * from performance_schema.setup_instruments; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES'; connection default; grant super on *.* to pfsuser@localhost; flush privileges; @@ -40,9 +40,9 @@ show grants; Grants for pfsuser@localhost GRANT SUPER ON *.* TO 'pfsuser'@'localhost' GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost' -select * from performance_schema.SETUP_INSTRUMENTS; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +select * from performance_schema.setup_instruments; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES'; connection default; set global read_only= @start_read_only; drop user pfsuser@localhost; diff --git a/mysql-test/suite/perfschema/r/schema.result b/mysql-test/suite/perfschema/r/schema.result index 1599d51a59f..5bafa137af5 100644 --- a/mysql-test/suite/perfschema/r/schema.result +++ b/mysql-test/suite/perfschema/r/schema.result @@ -8,32 +8,32 @@ 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` ( +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; +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 `EVENTS_WAITS_CURRENT` ( `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 `EVENTS_WAITS_HISTORY` ( `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 `EVENTS_WAITS_HISTORY_LONG` ( `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 TABLE `EVENTS_WAITS_SUMMARY_BY_INSTANCE` `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_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_ `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_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_GLO `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,51 +149,51 @@ FILE_SUMMARY_BY_INSTANCE CREATE TABLE `FILE_SUMMARY_BY_INSTANCE` ( `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_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, `PROCESSLIST_ID` int(11) DEFAULT NULL, `NAME` varchar(128) NOT NULL diff --git a/mysql-test/suite/perfschema/r/selects.result b/mysql-test/suite/perfschema/r/selects.result index 6d596ba8d9a..a3d0931cf4c 100644 --- a/mysql-test/suite/perfschema/r/selects.result +++ b/mysql-test/suite/perfschema/r/selects.result @@ -1,38 +1,38 @@ -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES'; +UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; DROP TABLE IF EXISTS t1; CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value') ENGINE=MyISAM; INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8); SELECT OPERATION, SUM(NUMBER_OF_BYTES) AS TOTAL -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long GROUP BY OPERATION HAVING TOTAL IS NOT NULL ORDER BY OPERATION LIMIT 1; OPERATION TOTAL chsize [NUM_BYTES] -SELECT EVENT_ID FROM performance_schema.EVENTS_WAITS_CURRENT +SELECT EVENT_ID FROM performance_schema.events_waits_current WHERE THREAD_ID IN -(SELECT THREAD_ID FROM performance_schema.THREADS) +(SELECT THREAD_ID FROM performance_schema.threads) AND EVENT_NAME IN -(SELECT NAME FROM performance_schema.SETUP_INSTRUMENTS +(SELECT NAME FROM performance_schema.setup_instruments WHERE NAME LIKE "wait/synch/%") LIMIT 1; EVENT_ID [EVENT_ID] SELECT DISTINCT EVENT_ID -FROM performance_schema.EVENTS_WAITS_CURRENT -JOIN performance_schema.EVENTS_WAITS_HISTORY USING (EVENT_ID) -JOIN performance_schema.EVENTS_WAITS_HISTORY_LONG USING (EVENT_ID) +FROM performance_schema.events_waits_current +JOIN performance_schema.events_waits_history USING (EVENT_ID) +JOIN performance_schema.events_waits_history_long USING (EVENT_ID) ORDER BY EVENT_ID LIMIT 1; EVENT_ID [EVENT_ID] SELECT t1.THREAD_ID, t2.EVENT_ID, t3.EVENT_NAME, t4.TIMER_WAIT -FROM performance_schema.EVENTS_WAITS_HISTORY t1 -JOIN performance_schema.EVENTS_WAITS_HISTORY t2 USING (EVENT_ID) -JOIN performance_schema.EVENTS_WAITS_HISTORY t3 ON (t2.THREAD_ID = t3.THREAD_ID) -JOIN performance_schema.EVENTS_WAITS_HISTORY t4 ON (t3.EVENT_NAME = t4.EVENT_NAME) +FROM performance_schema.events_waits_history t1 +JOIN performance_schema.events_waits_history t2 USING (EVENT_ID) +JOIN performance_schema.events_waits_history t3 ON (t2.THREAD_ID = t3.THREAD_ID) +JOIN performance_schema.events_waits_history t4 ON (t3.EVENT_NAME = t4.EVENT_NAME) ORDER BY t1.EVENT_ID, t2.EVENT_ID LIMIT 5; THREAD_ID EVENT_ID EVENT_NAME TIMER_WAIT @@ -42,11 +42,11 @@ THREAD_ID EVENT_ID EVENT_NAME TIMER_WAIT [THREAD_ID] [EVENT_ID] [EVENT_NAME] [TIMER_WAIT] [THREAD_ID] [EVENT_ID] [EVENT_NAME] [TIMER_WAIT] SELECT THREAD_ID, EVENT_ID FROM ( -SELECT THREAD_ID, EVENT_ID FROM performance_schema.EVENTS_WAITS_CURRENT +SELECT THREAD_ID, EVENT_ID FROM performance_schema.events_waits_current UNION -SELECT THREAD_ID, EVENT_ID FROM performance_schema.EVENTS_WAITS_HISTORY +SELECT THREAD_ID, EVENT_ID FROM performance_schema.events_waits_history UNION -SELECT THREAD_ID, EVENT_ID FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +SELECT THREAD_ID, EVENT_ID FROM performance_schema.events_waits_history_long ) t1 ORDER BY THREAD_ID, EVENT_ID LIMIT 5; THREAD_ID EVENT_ID @@ -58,14 +58,14 @@ THREAD_ID EVENT_ID 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 +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) +FROM performance_schema.events_waits_current +JOIN performance_schema.events_waits_history USING (EVENT_ID) ORDER BY EVENT_ID LIMIT 1; ALTER TABLE t1 ADD COLUMN c INT; @@ -73,7 +73,7 @@ DROP TRIGGER IF EXISTS t_ps_trigger; CREATE TRIGGER t_ps_trigger BEFORE INSERT ON t1 FOR EACH ROW BEGIN SET NEW.c = (SELECT MAX(EVENT_ID) -FROM performance_schema.EVENTS_WAITS_CURRENT); +FROM performance_schema.events_waits_current); END; | INSERT INTO t1 (id) VALUES (11), (12), (13); @@ -86,7 +86,7 @@ DROP TRIGGER t_ps_trigger; DROP PROCEDURE IF EXISTS t_ps_proc; CREATE PROCEDURE t_ps_proc(IN conid INT, OUT pid INT) BEGIN -SELECT thread_id FROM performance_schema.THREADS +SELECT thread_id FROM performance_schema.threads WHERE PROCESSLIST_ID = conid INTO pid; END; | @@ -94,7 +94,7 @@ CALL t_ps_proc(connection_id(), @p_id); DROP FUNCTION IF EXISTS t_ps_proc; CREATE FUNCTION t_ps_func(conid INT) RETURNS int BEGIN -return (SELECT thread_id FROM performance_schema.THREADS +return (SELECT thread_id FROM performance_schema.threads WHERE PROCESSLIST_ID = conid); END; | diff --git a/mysql-test/suite/perfschema/r/server_init.result b/mysql-test/suite/perfschema/r/server_init.result index 0c1e06d157c..950b63fd94c 100644 --- a/mysql-test/suite/perfschema/r/server_init.result +++ b/mysql-test/suite/perfschema/r/server_init.result @@ -1,209 +1,209 @@ use performance_schema; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_threads"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_malloc"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_open"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_isam"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_myisam"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_heap"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_net"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_charset"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_time"; count(name) 1 -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/mysys/THR_COND_threads"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_open"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_thread_count"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_status"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_error_log"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_delayed_insert"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_uuid_generator"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_delayed_status"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_delayed_create"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_crypt"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_slave_list"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_active_mi"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_manager"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_global_read_lock"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_global_system_variables"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_user_conn"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_prepared_stmt_count"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_connection_count"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_server_started"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_rpl_status"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/Query_cache::structure_guard_mutex"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_event_metadata"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_event_queue"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_user_locks"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/Cversion_lock"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_audit_mask"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_xid_cache"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_plugin"; count(name) 1 -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/tz_LOCK"; count(name) 1 -select count(name) from RWLOCK_INSTANCES +select count(name) from rwlock_instances where name like "wait/synch/rwlock/sql/LOCK_grant"; count(name) 1 -select count(name) from RWLOCK_INSTANCES +select count(name) from rwlock_instances where name like "wait/synch/rwlock/sql/LOCK_sys_init_connect"; count(name) 1 -select count(name) from RWLOCK_INSTANCES +select count(name) from rwlock_instances where name like "wait/synch/rwlock/sql/LOCK_sys_init_slave"; count(name) 1 -select count(name) from RWLOCK_INSTANCES +select count(name) from rwlock_instances where name like "wait/synch/rwlock/sql/LOCK_system_variables_hash"; count(name) 1 -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_server_started"; count(name) 1 -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_refresh"; count(name) 0 -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_thread_count"; count(name) 1 -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_manager"; count(name) 1 -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_global_read_lock"; count(name) 1 -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_thread_cache"; count(name) 1 -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_flush_thread_cache"; count(name) 1 -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_rpl_status"; count(name) 1 -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/Query_cache::COND_cache_status_changed"; count(name) 1 -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_queue_state"; count(name) 1 diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result index d03e227fc83..f32ffe327a2 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result @@ -5,35 +5,35 @@ mtr mysql performance_schema test -select count(*) from performance_schema.PERFORMANCE_TIMERS; +select count(*) from performance_schema.performance_timers; count(*) 5 -select count(*) from performance_schema.SETUP_CONSUMERS; +select count(*) from performance_schema.setup_consumers; count(*) 8 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -select count(*) from performance_schema.SETUP_TIMERS; +select count(*) from performance_schema.setup_timers; count(*) 1 -select * from performance_schema.COND_INSTANCES; -select * from performance_schema.EVENTS_WAITS_CURRENT; -select * from performance_schema.EVENTS_WAITS_HISTORY; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -select * from performance_schema.FILE_INSTANCES; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; -select * from performance_schema.MUTEX_INSTANCES; -select * from performance_schema.PERFORMANCE_TIMERS; -select * from performance_schema.RWLOCK_INSTANCES; -select * from performance_schema.SETUP_CONSUMERS; -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_TIMERS; -select * from performance_schema.THREADS; +select * from performance_schema.cond_instances; +select * from performance_schema.events_waits_current; +select * from performance_schema.events_waits_history; +select * from performance_schema.events_waits_history_long; +select * from performance_schema.events_waits_summary_by_instance; +select * from performance_schema.events_waits_summary_by_thread_by_event_name; +select * from performance_schema.events_waits_summary_global_by_event_name; +select * from performance_schema.file_instances; +select * from performance_schema.file_summary_by_event_name; +select * from performance_schema.file_summary_by_instance; +select * from performance_schema.mutex_instances; +select * from performance_schema.performance_timers; +select * from performance_schema.rwlock_instances; +select * from performance_schema.setup_consumers; +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_timers; +select * from performance_schema.threads; show variables like "performance_schema%"; Variable_name Value performance_schema ON @@ -57,7 +57,7 @@ show status like "performance_schema%"; show variables like "performance_schema_max_cond_classes"; Variable_name Value performance_schema_max_cond_classes 0 -select count(*) from performance_schema.SETUP_INSTRUMENTS +select count(*) from performance_schema.setup_instruments where name like "wait/synch/cond/%"; count(*) 0 @@ -65,7 +65,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_COND_CLASSES_LOST'; variable_value > 0 1 -select count(*) from performance_schema.COND_INSTANCES; +select count(*) from performance_schema.cond_instances; count(*) 0 show status like "performance_schema_cond_instances_lost"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result index 812dc329aaf..ef853ccc710 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result @@ -5,35 +5,35 @@ mtr mysql performance_schema test -select count(*) from performance_schema.PERFORMANCE_TIMERS; +select count(*) from performance_schema.performance_timers; count(*) 5 -select count(*) from performance_schema.SETUP_CONSUMERS; +select count(*) from performance_schema.setup_consumers; count(*) 8 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -select count(*) from performance_schema.SETUP_TIMERS; +select count(*) from performance_schema.setup_timers; count(*) 1 -select * from performance_schema.COND_INSTANCES; -select * from performance_schema.EVENTS_WAITS_CURRENT; -select * from performance_schema.EVENTS_WAITS_HISTORY; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -select * from performance_schema.FILE_INSTANCES; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; -select * from performance_schema.MUTEX_INSTANCES; -select * from performance_schema.PERFORMANCE_TIMERS; -select * from performance_schema.RWLOCK_INSTANCES; -select * from performance_schema.SETUP_CONSUMERS; -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_TIMERS; -select * from performance_schema.THREADS; +select * from performance_schema.cond_instances; +select * from performance_schema.events_waits_current; +select * from performance_schema.events_waits_history; +select * from performance_schema.events_waits_history_long; +select * from performance_schema.events_waits_summary_by_instance; +select * from performance_schema.events_waits_summary_by_thread_by_event_name; +select * from performance_schema.events_waits_summary_global_by_event_name; +select * from performance_schema.file_instances; +select * from performance_schema.file_summary_by_event_name; +select * from performance_schema.file_summary_by_instance; +select * from performance_schema.mutex_instances; +select * from performance_schema.performance_timers; +select * from performance_schema.rwlock_instances; +select * from performance_schema.setup_consumers; +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_timers; +select * from performance_schema.threads; show variables like "performance_schema%"; Variable_name Value performance_schema ON @@ -57,7 +57,7 @@ show status like "performance_schema%"; show variables like "performance_schema_max_cond_classes"; Variable_name Value performance_schema_max_cond_classes 80 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS +select count(*) > 0 from performance_schema.setup_instruments where name like "wait/synch/cond/%"; count(*) > 0 1 @@ -67,7 +67,7 @@ Performance_schema_cond_classes_lost 0 show variables like "performance_schema_max_cond_instances"; Variable_name Value performance_schema_max_cond_instances 0 -select count(*) from performance_schema.COND_INSTANCES; +select count(*) from performance_schema.cond_instances; count(*) 0 select variable_value > 0 from information_schema.global_status diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_class.result b/mysql-test/suite/perfschema/r/start_server_no_file_class.result index 7ef247e0755..bafb4cac270 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result @@ -5,35 +5,35 @@ mtr mysql performance_schema test -select count(*) from performance_schema.PERFORMANCE_TIMERS; +select count(*) from performance_schema.performance_timers; count(*) 5 -select count(*) from performance_schema.SETUP_CONSUMERS; +select count(*) from performance_schema.setup_consumers; count(*) 8 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -select count(*) from performance_schema.SETUP_TIMERS; +select count(*) from performance_schema.setup_timers; count(*) 1 -select * from performance_schema.COND_INSTANCES; -select * from performance_schema.EVENTS_WAITS_CURRENT; -select * from performance_schema.EVENTS_WAITS_HISTORY; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -select * from performance_schema.FILE_INSTANCES; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; -select * from performance_schema.MUTEX_INSTANCES; -select * from performance_schema.PERFORMANCE_TIMERS; -select * from performance_schema.RWLOCK_INSTANCES; -select * from performance_schema.SETUP_CONSUMERS; -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_TIMERS; -select * from performance_schema.THREADS; +select * from performance_schema.cond_instances; +select * from performance_schema.events_waits_current; +select * from performance_schema.events_waits_history; +select * from performance_schema.events_waits_history_long; +select * from performance_schema.events_waits_summary_by_instance; +select * from performance_schema.events_waits_summary_by_thread_by_event_name; +select * from performance_schema.events_waits_summary_global_by_event_name; +select * from performance_schema.file_instances; +select * from performance_schema.file_summary_by_event_name; +select * from performance_schema.file_summary_by_instance; +select * from performance_schema.mutex_instances; +select * from performance_schema.performance_timers; +select * from performance_schema.rwlock_instances; +select * from performance_schema.setup_consumers; +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_timers; +select * from performance_schema.threads; show variables like "performance_schema%"; Variable_name Value performance_schema ON @@ -57,7 +57,7 @@ show status like "performance_schema%"; show variables like "performance_schema_max_file_classes"; Variable_name Value performance_schema_max_file_classes 0 -select count(*) from performance_schema.SETUP_INSTRUMENTS +select count(*) from performance_schema.setup_instruments where name like "wait/io/file/%"; count(*) 0 @@ -65,7 +65,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_FILE_CLASSES_LOST'; variable_value > 0 1 -select count(*) from performance_schema.FILE_INSTANCES; +select count(*) from performance_schema.file_instances; count(*) 0 show status like "performance_schema_file_instances_lost"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result index 301c4e44f1e..2e557e5510a 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result @@ -5,35 +5,35 @@ mtr mysql performance_schema test -select count(*) from performance_schema.PERFORMANCE_TIMERS; +select count(*) from performance_schema.performance_timers; count(*) 5 -select count(*) from performance_schema.SETUP_CONSUMERS; +select count(*) from performance_schema.setup_consumers; count(*) 8 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -select count(*) from performance_schema.SETUP_TIMERS; +select count(*) from performance_schema.setup_timers; count(*) 1 -select * from performance_schema.COND_INSTANCES; -select * from performance_schema.EVENTS_WAITS_CURRENT; -select * from performance_schema.EVENTS_WAITS_HISTORY; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -select * from performance_schema.FILE_INSTANCES; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; -select * from performance_schema.MUTEX_INSTANCES; -select * from performance_schema.PERFORMANCE_TIMERS; -select * from performance_schema.RWLOCK_INSTANCES; -select * from performance_schema.SETUP_CONSUMERS; -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_TIMERS; -select * from performance_schema.THREADS; +select * from performance_schema.cond_instances; +select * from performance_schema.events_waits_current; +select * from performance_schema.events_waits_history; +select * from performance_schema.events_waits_history_long; +select * from performance_schema.events_waits_summary_by_instance; +select * from performance_schema.events_waits_summary_by_thread_by_event_name; +select * from performance_schema.events_waits_summary_global_by_event_name; +select * from performance_schema.file_instances; +select * from performance_schema.file_summary_by_event_name; +select * from performance_schema.file_summary_by_instance; +select * from performance_schema.mutex_instances; +select * from performance_schema.performance_timers; +select * from performance_schema.rwlock_instances; +select * from performance_schema.setup_consumers; +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_timers; +select * from performance_schema.threads; show variables like "performance_schema%"; Variable_name Value performance_schema ON @@ -57,7 +57,7 @@ show status like "performance_schema%"; show variables like "performance_schema_max_file_classes"; Variable_name Value performance_schema_max_file_classes 50 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS +select count(*) > 0 from performance_schema.setup_instruments where name like "wait/io/file/%"; count(*) > 0 1 @@ -67,7 +67,7 @@ Performance_schema_file_classes_lost 0 show variables like "performance_schema_max_file_instances"; Variable_name Value performance_schema_max_file_instances 0 -select count(*) from performance_schema.FILE_INSTANCES; +select count(*) from performance_schema.file_instances; count(*) 0 select variable_value > 0 from information_schema.global_status diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result index a1f880d3b9e..b6d359ae5d2 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result @@ -5,35 +5,35 @@ mtr mysql performance_schema test -select count(*) from performance_schema.PERFORMANCE_TIMERS; +select count(*) from performance_schema.performance_timers; count(*) 5 -select count(*) from performance_schema.SETUP_CONSUMERS; +select count(*) from performance_schema.setup_consumers; count(*) 8 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -select count(*) from performance_schema.SETUP_TIMERS; +select count(*) from performance_schema.setup_timers; count(*) 1 -select * from performance_schema.COND_INSTANCES; -select * from performance_schema.EVENTS_WAITS_CURRENT; -select * from performance_schema.EVENTS_WAITS_HISTORY; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -select * from performance_schema.FILE_INSTANCES; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; -select * from performance_schema.MUTEX_INSTANCES; -select * from performance_schema.PERFORMANCE_TIMERS; -select * from performance_schema.RWLOCK_INSTANCES; -select * from performance_schema.SETUP_CONSUMERS; -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_TIMERS; -select * from performance_schema.THREADS; +select * from performance_schema.cond_instances; +select * from performance_schema.events_waits_current; +select * from performance_schema.events_waits_history; +select * from performance_schema.events_waits_history_long; +select * from performance_schema.events_waits_summary_by_instance; +select * from performance_schema.events_waits_summary_by_thread_by_event_name; +select * from performance_schema.events_waits_summary_global_by_event_name; +select * from performance_schema.file_instances; +select * from performance_schema.file_summary_by_event_name; +select * from performance_schema.file_summary_by_instance; +select * from performance_schema.mutex_instances; +select * from performance_schema.performance_timers; +select * from performance_schema.rwlock_instances; +select * from performance_schema.setup_consumers; +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_timers; +select * from performance_schema.threads; show variables like "performance_schema%"; Variable_name Value performance_schema ON @@ -57,7 +57,7 @@ show status like "performance_schema%"; show variables like "performance_schema_max_mutex_classes"; Variable_name Value performance_schema_max_mutex_classes 0 -select count(*) from performance_schema.SETUP_INSTRUMENTS +select count(*) from performance_schema.setup_instruments where name like "wait/synch/mutex/%"; count(*) 0 @@ -65,7 +65,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_MUTEX_CLASSES_LOST'; variable_value > 0 1 -select count(*) from performance_schema.MUTEX_INSTANCES; +select count(*) from performance_schema.mutex_instances; count(*) 0 show status like "performance_schema_mutex_instances_lost"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result index ab566f0703a..190d58378ac 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result @@ -5,35 +5,35 @@ mtr mysql performance_schema test -select count(*) from performance_schema.PERFORMANCE_TIMERS; +select count(*) from performance_schema.performance_timers; count(*) 5 -select count(*) from performance_schema.SETUP_CONSUMERS; +select count(*) from performance_schema.setup_consumers; count(*) 8 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -select count(*) from performance_schema.SETUP_TIMERS; +select count(*) from performance_schema.setup_timers; count(*) 1 -select * from performance_schema.COND_INSTANCES; -select * from performance_schema.EVENTS_WAITS_CURRENT; -select * from performance_schema.EVENTS_WAITS_HISTORY; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -select * from performance_schema.FILE_INSTANCES; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; -select * from performance_schema.MUTEX_INSTANCES; -select * from performance_schema.PERFORMANCE_TIMERS; -select * from performance_schema.RWLOCK_INSTANCES; -select * from performance_schema.SETUP_CONSUMERS; -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_TIMERS; -select * from performance_schema.THREADS; +select * from performance_schema.cond_instances; +select * from performance_schema.events_waits_current; +select * from performance_schema.events_waits_history; +select * from performance_schema.events_waits_history_long; +select * from performance_schema.events_waits_summary_by_instance; +select * from performance_schema.events_waits_summary_by_thread_by_event_name; +select * from performance_schema.events_waits_summary_global_by_event_name; +select * from performance_schema.file_instances; +select * from performance_schema.file_summary_by_event_name; +select * from performance_schema.file_summary_by_instance; +select * from performance_schema.mutex_instances; +select * from performance_schema.performance_timers; +select * from performance_schema.rwlock_instances; +select * from performance_schema.setup_consumers; +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_timers; +select * from performance_schema.threads; show variables like "performance_schema%"; Variable_name Value performance_schema ON @@ -57,7 +57,7 @@ show status like "performance_schema%"; show variables like "performance_schema_max_mutex_classes"; Variable_name Value performance_schema_max_mutex_classes 200 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS +select count(*) > 0 from performance_schema.setup_instruments where name like "wait/synch/mutex/%"; count(*) > 0 1 @@ -67,7 +67,7 @@ Performance_schema_mutex_classes_lost 0 show variables like "performance_schema_max_mutex_instances"; Variable_name Value performance_schema_max_mutex_instances 0 -select count(*) from performance_schema.MUTEX_INSTANCES; +select count(*) from performance_schema.mutex_instances; count(*) 0 select variable_value > 0 from information_schema.global_status diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result index aabc9ec49bb..b27159828f6 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result @@ -5,35 +5,35 @@ mtr mysql performance_schema test -select count(*) from performance_schema.PERFORMANCE_TIMERS; +select count(*) from performance_schema.performance_timers; count(*) 5 -select count(*) from performance_schema.SETUP_CONSUMERS; +select count(*) from performance_schema.setup_consumers; count(*) 8 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -select count(*) from performance_schema.SETUP_TIMERS; +select count(*) from performance_schema.setup_timers; count(*) 1 -select * from performance_schema.COND_INSTANCES; -select * from performance_schema.EVENTS_WAITS_CURRENT; -select * from performance_schema.EVENTS_WAITS_HISTORY; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -select * from performance_schema.FILE_INSTANCES; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; -select * from performance_schema.MUTEX_INSTANCES; -select * from performance_schema.PERFORMANCE_TIMERS; -select * from performance_schema.RWLOCK_INSTANCES; -select * from performance_schema.SETUP_CONSUMERS; -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_TIMERS; -select * from performance_schema.THREADS; +select * from performance_schema.cond_instances; +select * from performance_schema.events_waits_current; +select * from performance_schema.events_waits_history; +select * from performance_schema.events_waits_history_long; +select * from performance_schema.events_waits_summary_by_instance; +select * from performance_schema.events_waits_summary_by_thread_by_event_name; +select * from performance_schema.events_waits_summary_global_by_event_name; +select * from performance_schema.file_instances; +select * from performance_schema.file_summary_by_event_name; +select * from performance_schema.file_summary_by_instance; +select * from performance_schema.mutex_instances; +select * from performance_schema.performance_timers; +select * from performance_schema.rwlock_instances; +select * from performance_schema.setup_consumers; +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_timers; +select * from performance_schema.threads; show variables like "performance_schema%"; Variable_name Value performance_schema ON @@ -57,7 +57,7 @@ show status like "performance_schema%"; show variables like "performance_schema_max_rwlock_classes"; Variable_name Value performance_schema_max_rwlock_classes 0 -select count(*) from performance_schema.SETUP_INSTRUMENTS +select count(*) from performance_schema.setup_instruments where name like "wait/synch/rwlock/%"; count(*) 0 @@ -65,7 +65,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_RWLOCK_CLASSES_LOST'; variable_value > 0 1 -select count(*) from performance_schema.RWLOCK_INSTANCES; +select count(*) from performance_schema.rwlock_instances; count(*) 0 show status like "performance_schema_rwlock_instances_lost"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result index 5e5998a9959..7466235c42f 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result @@ -5,35 +5,35 @@ mtr mysql performance_schema test -select count(*) from performance_schema.PERFORMANCE_TIMERS; +select count(*) from performance_schema.performance_timers; count(*) 5 -select count(*) from performance_schema.SETUP_CONSUMERS; +select count(*) from performance_schema.setup_consumers; count(*) 8 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -select count(*) from performance_schema.SETUP_TIMERS; +select count(*) from performance_schema.setup_timers; count(*) 1 -select * from performance_schema.COND_INSTANCES; -select * from performance_schema.EVENTS_WAITS_CURRENT; -select * from performance_schema.EVENTS_WAITS_HISTORY; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -select * from performance_schema.FILE_INSTANCES; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; -select * from performance_schema.MUTEX_INSTANCES; -select * from performance_schema.PERFORMANCE_TIMERS; -select * from performance_schema.RWLOCK_INSTANCES; -select * from performance_schema.SETUP_CONSUMERS; -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_TIMERS; -select * from performance_schema.THREADS; +select * from performance_schema.cond_instances; +select * from performance_schema.events_waits_current; +select * from performance_schema.events_waits_history; +select * from performance_schema.events_waits_history_long; +select * from performance_schema.events_waits_summary_by_instance; +select * from performance_schema.events_waits_summary_by_thread_by_event_name; +select * from performance_schema.events_waits_summary_global_by_event_name; +select * from performance_schema.file_instances; +select * from performance_schema.file_summary_by_event_name; +select * from performance_schema.file_summary_by_instance; +select * from performance_schema.mutex_instances; +select * from performance_schema.performance_timers; +select * from performance_schema.rwlock_instances; +select * from performance_schema.setup_consumers; +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_timers; +select * from performance_schema.threads; show variables like "performance_schema%"; Variable_name Value performance_schema ON @@ -57,7 +57,7 @@ show status like "performance_schema%"; show variables like "performance_schema_max_rwlock_classes"; Variable_name Value performance_schema_max_rwlock_classes 30 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS +select count(*) > 0 from performance_schema.setup_instruments where name like "wait/synch/rwlock/%"; count(*) > 0 1 @@ -67,7 +67,7 @@ Performance_schema_rwlock_classes_lost 0 show variables like "performance_schema_max_rwlock_instances"; Variable_name Value performance_schema_max_rwlock_instances 0 -select count(*) from performance_schema.RWLOCK_INSTANCES; +select count(*) from performance_schema.rwlock_instances; count(*) 0 select variable_value > 0 from information_schema.global_status diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result index 96c3cae97ab..075c22bc405 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result @@ -5,35 +5,35 @@ mtr mysql performance_schema test -select count(*) from performance_schema.PERFORMANCE_TIMERS; +select count(*) from performance_schema.performance_timers; count(*) 5 -select count(*) from performance_schema.SETUP_CONSUMERS; +select count(*) from performance_schema.setup_consumers; count(*) 8 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -select count(*) from performance_schema.SETUP_TIMERS; +select count(*) from performance_schema.setup_timers; count(*) 1 -select * from performance_schema.COND_INSTANCES; -select * from performance_schema.EVENTS_WAITS_CURRENT; -select * from performance_schema.EVENTS_WAITS_HISTORY; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -select * from performance_schema.FILE_INSTANCES; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; -select * from performance_schema.MUTEX_INSTANCES; -select * from performance_schema.PERFORMANCE_TIMERS; -select * from performance_schema.RWLOCK_INSTANCES; -select * from performance_schema.SETUP_CONSUMERS; -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_TIMERS; -select * from performance_schema.THREADS; +select * from performance_schema.cond_instances; +select * from performance_schema.events_waits_current; +select * from performance_schema.events_waits_history; +select * from performance_schema.events_waits_history_long; +select * from performance_schema.events_waits_summary_by_instance; +select * from performance_schema.events_waits_summary_by_thread_by_event_name; +select * from performance_schema.events_waits_summary_global_by_event_name; +select * from performance_schema.file_instances; +select * from performance_schema.file_summary_by_event_name; +select * from performance_schema.file_summary_by_instance; +select * from performance_schema.mutex_instances; +select * from performance_schema.performance_timers; +select * from performance_schema.rwlock_instances; +select * from performance_schema.setup_consumers; +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_timers; +select * from performance_schema.threads; show variables like "performance_schema%"; Variable_name Value performance_schema ON @@ -57,7 +57,7 @@ show status like "performance_schema%"; show variables like "performance_schema_max_thread_classes"; Variable_name Value performance_schema_max_thread_classes 0 -select count(*) from performance_schema.SETUP_INSTRUMENTS +select count(*) from performance_schema.setup_instruments where name like "thread/%"; count(*) 0 @@ -65,7 +65,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_THREAD_CLASSES_LOST'; variable_value > 0 1 -select count(*) from performance_schema.THREADS; +select count(*) from performance_schema.threads; count(*) 0 show status like "performance_schema_thread_instances_lost"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result index e2cf0917cbf..763b5b69ca1 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result @@ -5,35 +5,35 @@ mtr mysql performance_schema test -select count(*) from performance_schema.PERFORMANCE_TIMERS; +select count(*) from performance_schema.performance_timers; count(*) 5 -select count(*) from performance_schema.SETUP_CONSUMERS; +select count(*) from performance_schema.setup_consumers; count(*) 8 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -select count(*) from performance_schema.SETUP_TIMERS; +select count(*) from performance_schema.setup_timers; count(*) 1 -select * from performance_schema.COND_INSTANCES; -select * from performance_schema.EVENTS_WAITS_CURRENT; -select * from performance_schema.EVENTS_WAITS_HISTORY; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -select * from performance_schema.FILE_INSTANCES; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; -select * from performance_schema.MUTEX_INSTANCES; -select * from performance_schema.PERFORMANCE_TIMERS; -select * from performance_schema.RWLOCK_INSTANCES; -select * from performance_schema.SETUP_CONSUMERS; -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_TIMERS; -select * from performance_schema.THREADS; +select * from performance_schema.cond_instances; +select * from performance_schema.events_waits_current; +select * from performance_schema.events_waits_history; +select * from performance_schema.events_waits_history_long; +select * from performance_schema.events_waits_summary_by_instance; +select * from performance_schema.events_waits_summary_by_thread_by_event_name; +select * from performance_schema.events_waits_summary_global_by_event_name; +select * from performance_schema.file_instances; +select * from performance_schema.file_summary_by_event_name; +select * from performance_schema.file_summary_by_instance; +select * from performance_schema.mutex_instances; +select * from performance_schema.performance_timers; +select * from performance_schema.rwlock_instances; +select * from performance_schema.setup_consumers; +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_timers; +select * from performance_schema.threads; show variables like "performance_schema%"; Variable_name Value performance_schema ON @@ -63,7 +63,7 @@ Performance_schema_thread_classes_lost 0 show variables like "performance_schema_max_thread_instances"; Variable_name Value performance_schema_max_thread_instances 0 -select count(*) from performance_schema.THREADS; +select count(*) from performance_schema.threads; count(*) 0 select variable_value > 0 from information_schema.global_status diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result index 8bf52580e77..4cdfad654ae 100644 --- a/mysql-test/suite/perfschema/r/start_server_off.result +++ b/mysql-test/suite/perfschema/r/start_server_off.result @@ -5,35 +5,35 @@ mtr mysql performance_schema test -select count(*) from performance_schema.PERFORMANCE_TIMERS; +select count(*) from performance_schema.performance_timers; count(*) 5 -select count(*) from performance_schema.SETUP_CONSUMERS; +select count(*) from performance_schema.setup_consumers; count(*) 8 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 0 -select count(*) from performance_schema.SETUP_TIMERS; +select count(*) from performance_schema.setup_timers; count(*) 1 -select * from performance_schema.COND_INSTANCES; -select * from performance_schema.EVENTS_WAITS_CURRENT; -select * from performance_schema.EVENTS_WAITS_HISTORY; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -select * from performance_schema.FILE_INSTANCES; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; -select * from performance_schema.MUTEX_INSTANCES; -select * from performance_schema.PERFORMANCE_TIMERS; -select * from performance_schema.RWLOCK_INSTANCES; -select * from performance_schema.SETUP_CONSUMERS; -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_TIMERS; -select * from performance_schema.THREADS; +select * from performance_schema.cond_instances; +select * from performance_schema.events_waits_current; +select * from performance_schema.events_waits_history; +select * from performance_schema.events_waits_history_long; +select * from performance_schema.events_waits_summary_by_instance; +select * from performance_schema.events_waits_summary_by_thread_by_event_name; +select * from performance_schema.events_waits_summary_global_by_event_name; +select * from performance_schema.file_instances; +select * from performance_schema.file_summary_by_event_name; +select * from performance_schema.file_summary_by_instance; +select * from performance_schema.mutex_instances; +select * from performance_schema.performance_timers; +select * from performance_schema.rwlock_instances; +select * from performance_schema.setup_consumers; +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_timers; +select * from performance_schema.threads; show variables like "performance_schema%"; Variable_name Value performance_schema OFF diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result index 15fe4e082ab..a17f78b27db 100644 --- a/mysql-test/suite/perfschema/r/start_server_on.result +++ b/mysql-test/suite/perfschema/r/start_server_on.result @@ -5,35 +5,35 @@ mtr mysql performance_schema test -select count(*) from performance_schema.PERFORMANCE_TIMERS; +select count(*) from performance_schema.performance_timers; count(*) 5 -select count(*) from performance_schema.SETUP_CONSUMERS; +select count(*) from performance_schema.setup_consumers; count(*) 8 -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; +select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 -select count(*) from performance_schema.SETUP_TIMERS; +select count(*) from performance_schema.setup_timers; count(*) 1 -select * from performance_schema.COND_INSTANCES; -select * from performance_schema.EVENTS_WAITS_CURRENT; -select * from performance_schema.EVENTS_WAITS_HISTORY; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -select * from performance_schema.FILE_INSTANCES; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; -select * from performance_schema.MUTEX_INSTANCES; -select * from performance_schema.PERFORMANCE_TIMERS; -select * from performance_schema.RWLOCK_INSTANCES; -select * from performance_schema.SETUP_CONSUMERS; -select * from performance_schema.SETUP_INSTRUMENTS; -select * from performance_schema.SETUP_TIMERS; -select * from performance_schema.THREADS; +select * from performance_schema.cond_instances; +select * from performance_schema.events_waits_current; +select * from performance_schema.events_waits_history; +select * from performance_schema.events_waits_history_long; +select * from performance_schema.events_waits_summary_by_instance; +select * from performance_schema.events_waits_summary_by_thread_by_event_name; +select * from performance_schema.events_waits_summary_global_by_event_name; +select * from performance_schema.file_instances; +select * from performance_schema.file_summary_by_event_name; +select * from performance_schema.file_summary_by_instance; +select * from performance_schema.mutex_instances; +select * from performance_schema.performance_timers; +select * from performance_schema.rwlock_instances; +select * from performance_schema.setup_consumers; +select * from performance_schema.setup_instruments; +select * from performance_schema.setup_timers; +select * from performance_schema.threads; show variables like "performance_schema%"; Variable_name Value performance_schema ON diff --git a/mysql-test/suite/perfschema/r/tampered_perfschema_table1.result b/mysql-test/suite/perfschema/r/tampered_perfschema_table1.result index cdf0029eeb9..6e49dc06db5 100644 --- a/mysql-test/suite/perfschema/r/tampered_perfschema_table1.result +++ b/mysql-test/suite/perfschema/r/tampered_perfschema_table1.result @@ -1,6 +1,6 @@ call mtr.add_suppression( -"Column count of mysql.SETUP_INSTRUMENTS is wrong. " +"Column count of mysql.setup_instruments is wrong. " "Expected 4, found 3. The table is probably corrupted"); -select * from performance_schema.SETUP_INSTRUMENTS limit 1; +select * from performance_schema.setup_instruments limit 1; ERROR HY000: Native table 'performance_schema'.'SETUP_INSTRUMENTS' has the wrong structure -select * from performance_schema.SETUP_CONSUMERS limit 1; +select * from performance_schema.setup_consumers limit 1; diff --git a/mysql-test/suite/perfschema/t/aggregate.test b/mysql-test/suite/perfschema/t/aggregate.test index a8ca3dd91e2..13906af3099 100644 --- a/mysql-test/suite/perfschema/t/aggregate.test +++ b/mysql-test/suite/perfschema/t/aggregate.test @@ -25,19 +25,19 @@ drop table if exists t1; --enable_warnings -update performance_schema.SETUP_INSTRUMENTS set enabled = 'NO'; -update performance_schema.SETUP_CONSUMERS set enabled = 'NO'; +update performance_schema.setup_instruments set enabled = 'NO'; +update performance_schema.setup_consumers set enabled = 'NO'; # Cleanup statistics -truncate table performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -truncate table performance_schema.FILE_SUMMARY_BY_INSTANCE; -truncate table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -truncate table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -truncate table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; +truncate table performance_schema.file_summary_by_event_name; +truncate table performance_schema.file_summary_by_instance; +truncate table performance_schema.events_waits_summary_global_by_event_name; +truncate table performance_schema.events_waits_summary_by_instance; +truncate table performance_schema.events_waits_summary_by_thread_by_event_name; # Start recording data -update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; -update performance_schema.SETUP_INSTRUMENTS +update performance_schema.setup_consumers set enabled = 'YES'; +update performance_schema.setup_instruments set enabled = 'YES', timed = 'YES'; @@ -49,27 +49,27 @@ create table t1 ( insert into t1 (id) values (1), (2), (3), (4), (5), (6), (7), (8); # Stop recording data, so the select below don't add noise. -update performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO'; +update performance_schema.setup_instruments SET enabled = 'NO'; # Disable all consumers, for long standing waits -update performance_schema.SETUP_CONSUMERS set enabled = 'NO'; +update performance_schema.setup_consumers set enabled = 'NO'; # Helper to debug set @dump_all=FALSE; # Note that in general: -# - COUNT/SUM/MAX(FILE_SUMMARY_BY_EVENT_NAME) >= -# COUNT/SUM/MAX(FILE_SUMMARY_BY_INSTANCE). -# - MIN(FILE_SUMMARY_BY_EVENT_NAME) <= -# MIN(FILE_SUMMARY_BY_INSTANCE). +# - COUNT/SUM/MAX(file_summary_by_event_name) >= +# COUNT/SUM/MAX(file_summary_by_instance). +# - MIN(file_summary_by_event_name) <= +# MIN(file_summary_by_instance). # There will be equality only when file instances are not removed, # aka when a file is not deleted from the file system, -# because doing so removes a row in FILE_SUMMARY_BY_INSTANCE. +# because doing so removes a row in file_summary_by_instance. # Likewise: -# - COUNT/SUM/MAX(EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME) >= -# COUNT/SUM/MAX(EVENTS_WAITS_SUMMARY_BY_INSTANCE) -# - MIN(EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME) <= -# MIN(EVENTS_WAITS_SUMMARY_BY_INSTANCE) +# - COUNT/SUM/MAX(events_waits_summary_global_by_event_name) >= +# COUNT/SUM/MAX(events_waits_summary_by_instance) +# - MIN(events_waits_summary_global_by_event_name) <= +# MIN(events_waits_summary_by_instance) # There will be equality only when an instrument instance # is not removed, which is next to impossible to predictably guarantee # in the server. @@ -77,18 +77,18 @@ set @dump_all=FALSE; # will cause a mysql_mutex_destroy on myisam/MYISAM_SHARE::intern_lock. # Another example, a thread terminating will cause a mysql_mutex_destroy # on sql/LOCK_delete -# Both cause a row to be deleted from EVENTS_WAITS_SUMMARY_BY_INSTANCE. +# Both cause a row to be deleted from events_waits_summary_by_instance. # Likewise: -# - COUNT/SUM/MAX(EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME) >= -# COUNT/SUM/MAX(EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME) -# - MIN(EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME) <= -# MIN(EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME) +# - COUNT/SUM/MAX(events_waits_summary_global_by_event_name) >= +# COUNT/SUM/MAX(events_waits_summary_by_thread_by_event_name) +# - MIN(events_waits_summary_global_by_event_name) <= +# MIN(events_waits_summary_by_thread_by_event_name) # There will be equality only when no thread is removed, # that is if no thread disconnects, or no sub thread (for example insert # delayed) ever completes. # A thread completing will cause rows in -# EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME to be removed. +# events_waits_summary_by_thread_by_event_name to be removed. --echo "Verifying file aggregate consistency" @@ -101,29 +101,29 @@ set @dump_all=FALSE; # If any of these queries returns data, the test failed. SELECT EVENT_NAME, e.COUNT_READ, SUM(i.COUNT_READ) -FROM performance_schema.FILE_SUMMARY_BY_EVENT_NAME AS e -JOIN performance_schema.FILE_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.file_summary_by_event_name AS e +JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.COUNT_READ <> SUM(i.COUNT_READ)) OR @dump_all; SELECT EVENT_NAME, e.COUNT_WRITE, SUM(i.COUNT_WRITE) -FROM performance_schema.FILE_SUMMARY_BY_EVENT_NAME AS e -JOIN performance_schema.FILE_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.file_summary_by_event_name AS e +JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE)) OR @dump_all; SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_READ, SUM(i.SUM_NUMBER_OF_BYTES_READ) -FROM performance_schema.FILE_SUMMARY_BY_EVENT_NAME AS e -JOIN performance_schema.FILE_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.file_summary_by_event_name AS e +JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.SUM_NUMBER_OF_BYTES_READ <> SUM(i.SUM_NUMBER_OF_BYTES_READ)) OR @dump_all; SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_WRITE, SUM(i.SUM_NUMBER_OF_BYTES_WRITE) -FROM performance_schema.FILE_SUMMARY_BY_EVENT_NAME AS e -JOIN performance_schema.FILE_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.file_summary_by_event_name AS e +JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.SUM_NUMBER_OF_BYTES_WRITE <> SUM(i.SUM_NUMBER_OF_BYTES_WRITE)) OR @dump_all; @@ -131,23 +131,23 @@ OR @dump_all; --echo "Verifying waits aggregate consistency (instance)" SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(i.SUM_TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e -JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.events_waits_summary_global_by_event_name AS e +JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.SUM_TIMER_WAIT < SUM(i.SUM_TIMER_WAIT)) OR @dump_all; SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(i.MIN_TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e -JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.events_waits_summary_global_by_event_name AS e +JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.MIN_TIMER_WAIT > MIN(i.MIN_TIMER_WAIT)) AND (MIN(i.MIN_TIMER_WAIT) != 0) OR @dump_all; SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(i.MAX_TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e -JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) +FROM performance_schema.events_waits_summary_global_by_event_name AS e +JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.MAX_TIMER_WAIT < MAX(i.MAX_TIMER_WAIT)) OR @dump_all; @@ -155,16 +155,16 @@ OR @dump_all; --echo "Verifying waits aggregate consistency (thread)" SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(t.SUM_TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e -JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t +FROM performance_schema.events_waits_summary_global_by_event_name AS e +JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.SUM_TIMER_WAIT < SUM(t.SUM_TIMER_WAIT)) OR @dump_all; SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(t.MIN_TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e -JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t +FROM performance_schema.events_waits_summary_global_by_event_name AS e +JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.MIN_TIMER_WAIT > MIN(t.MIN_TIMER_WAIT)) @@ -172,8 +172,8 @@ AND (MIN(t.MIN_TIMER_WAIT) != 0) OR @dump_all; SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(t.MAX_TIMER_WAIT) -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e -JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t +FROM performance_schema.events_waits_summary_global_by_event_name AS e +JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t USING (EVENT_NAME) GROUP BY EVENT_NAME HAVING (e.MAX_TIMER_WAIT < MAX(t.MAX_TIMER_WAIT)) @@ -182,8 +182,8 @@ OR @dump_all; # Cleanup -update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; -update performance_schema.SETUP_INSTRUMENTS +update performance_schema.setup_consumers set enabled = 'YES'; +update performance_schema.setup_instruments set enabled = 'YES', timed = 'YES'; drop table test.t1; diff --git a/mysql-test/suite/perfschema/t/checksum.test b/mysql-test/suite/perfschema/t/checksum.test index d7fdd7b4c2c..0600edcef26 100644 --- a/mysql-test/suite/perfschema/t/checksum.test +++ b/mysql-test/suite/perfschema/t/checksum.test @@ -24,41 +24,41 @@ # --disable_result_log -checksum table performance_schema.COND_INSTANCES; -checksum table performance_schema.EVENTS_WAITS_CURRENT; -checksum table performance_schema.EVENTS_WAITS_HISTORY; -checksum table performance_schema.EVENTS_WAITS_HISTORY_LONG; -checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; -checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -checksum table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -checksum table performance_schema.FILE_INSTANCES; -checksum table performance_schema.FILE_SUMMARY_BY_EVENT_NAME; -checksum table performance_schema.FILE_SUMMARY_BY_INSTANCE; -checksum table performance_schema.MUTEX_INSTANCES; -checksum table performance_schema.PERFORMANCE_TIMERS; -checksum table performance_schema.RWLOCK_INSTANCES; -checksum table performance_schema.SETUP_CONSUMERS; -checksum table performance_schema.SETUP_INSTRUMENTS; -checksum table performance_schema.SETUP_TIMERS; -checksum table performance_schema.THREADS; +checksum table performance_schema.cond_instances; +checksum table performance_schema.events_waits_current; +checksum table performance_schema.events_waits_history; +checksum table performance_schema.events_waits_history_long; +checksum table performance_schema.events_waits_summary_by_instance; +checksum table performance_schema.events_waits_summary_by_thread_by_event_name; +checksum table performance_schema.events_waits_summary_global_by_event_name; +checksum table performance_schema.file_instances; +checksum table performance_schema.file_summary_by_event_name; +checksum table performance_schema.file_summary_by_instance; +checksum table performance_schema.mutex_instances; +checksum table performance_schema.performance_timers; +checksum table performance_schema.rwlock_instances; +checksum table performance_schema.setup_consumers; +checksum table performance_schema.setup_instruments; +checksum table performance_schema.setup_timers; +checksum table performance_schema.threads; -checksum table performance_schema.COND_INSTANCES extended; -checksum table performance_schema.EVENTS_WAITS_CURRENT extended; -checksum table performance_schema.EVENTS_WAITS_HISTORY extended; -checksum table performance_schema.EVENTS_WAITS_HISTORY_LONG extended; -checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE extended; -checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME extended; -checksum table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME extended; -checksum table performance_schema.FILE_INSTANCES extended; -checksum table performance_schema.FILE_SUMMARY_BY_EVENT_NAME extended; -checksum table performance_schema.FILE_SUMMARY_BY_INSTANCE extended; -checksum table performance_schema.MUTEX_INSTANCES extended; -checksum table performance_schema.PERFORMANCE_TIMERS extended; -checksum table performance_schema.RWLOCK_INSTANCES extended; -checksum table performance_schema.SETUP_CONSUMERS extended; -checksum table performance_schema.SETUP_INSTRUMENTS extended; -checksum table performance_schema.SETUP_TIMERS extended; -checksum table performance_schema.THREADS extended; +checksum table performance_schema.cond_instances extended; +checksum table performance_schema.events_waits_current extended; +checksum table performance_schema.events_waits_history extended; +checksum table performance_schema.events_waits_history_long extended; +checksum table performance_schema.events_waits_summary_by_instance extended; +checksum table performance_schema.events_waits_summary_by_thread_by_event_name extended; +checksum table performance_schema.events_waits_summary_global_by_event_name extended; +checksum table performance_schema.file_instances extended; +checksum table performance_schema.file_summary_by_event_name extended; +checksum table performance_schema.file_summary_by_instance extended; +checksum table performance_schema.mutex_instances extended; +checksum table performance_schema.performance_timers extended; +checksum table performance_schema.rwlock_instances extended; +checksum table performance_schema.setup_consumers extended; +checksum table performance_schema.setup_instruments extended; +checksum table performance_schema.setup_timers extended; +checksum table performance_schema.threads extended; --enable_result_log diff --git a/mysql-test/suite/perfschema/t/column_privilege.test b/mysql-test/suite/perfschema/t/column_privilege.test index b6bcbdb3396..a1b0ede6b45 100644 --- a/mysql-test/suite/perfschema/t/column_privilege.test +++ b/mysql-test/suite/perfschema/t/column_privilege.test @@ -26,10 +26,10 @@ grant usage on *.* to 'pfs_user_5'@localhost with GRANT OPTION; # Test per column privileges on performance_schema -grant SELECT(thread_id, event_id) on performance_schema.EVENTS_WAITS_CURRENT +grant SELECT(thread_id, event_id) on performance_schema.events_waits_current to 'pfs_user_5'@localhost; -grant UPDATE(enabled) on performance_schema.SETUP_INSTRUMENTS +grant UPDATE(enabled) on performance_schema.setup_instruments to 'pfs_user_5'@localhost; flush privileges; @@ -42,32 +42,28 @@ connect (con1, localhost, pfs_user_5, , ); # For statements that works, we do not look at the output --disable_result_log -select thread_id from performance_schema.EVENTS_WAITS_CURRENT; +select thread_id from performance_schema.events_waits_current; -select thread_id, event_id from performance_schema.EVENTS_WAITS_CURRENT; +select thread_id, event_id from performance_schema.events_waits_current; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; --enable_result_log # For statements that are denied, check the error number and error text. ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_COLUMNACCESS_DENIED_ERROR -select event_name from performance_schema.EVENTS_WAITS_CURRENT; +select event_name from performance_schema.events_waits_current; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_COLUMNACCESS_DENIED_ERROR select thread_id, event_id, event_name - from performance_schema.EVENTS_WAITS_CURRENT; + from performance_schema.events_waits_current; ---replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS' --error ER_COLUMNACCESS_DENIED_ERROR -update performance_schema.SETUP_INSTRUMENTS set name='illegal'; +update performance_schema.setup_instruments set name='illegal'; ---replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS' --error ER_COLUMNACCESS_DENIED_ERROR -update performance_schema.SETUP_INSTRUMENTS set timed='NO'; +update performance_schema.setup_instruments set timed='NO'; # Cleanup @@ -76,7 +72,7 @@ update performance_schema.SETUP_INSTRUMENTS set timed='NO'; REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'pfs_user_5'@localhost; DROP USER 'pfs_user_5'@localhost; flush privileges; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES'; -UPDATE performance_schema.SETUP_CONSUMERS SET enabled = 'YES'; -UPDATE performance_schema.SETUP_TIMERS SET timer_name = 'CYCLE'; +UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; +UPDATE performance_schema.setup_consumers SET enabled = 'YES'; +UPDATE performance_schema.setup_timers SET timer_name = 'CYCLE'; diff --git a/mysql-test/suite/perfschema/t/ddl_cond_instances.test b/mysql-test/suite/perfschema/t/ddl_cond_instances.test index e78429cb181..2da1100702f 100644 --- a/mysql-test/suite/perfschema/t/ddl_cond_instances.test +++ b/mysql-test/suite/perfschema/t/ddl_cond_instances.test @@ -19,14 +19,14 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.COND_INSTANCES add column foo integer; +alter table performance_schema.cond_instances add column foo integer; -- error ER_WRONG_PERFSCHEMA_USAGE -truncate table performance_schema.COND_INSTANCES; +truncate table performance_schema.cond_instances; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.COND_INSTANCES ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.cond_instances ADD INDEX test_index(NAME); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.COND_INSTANCES(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.cond_instances(NAME); diff --git a/mysql-test/suite/perfschema/t/ddl_events_waits_current.test b/mysql-test/suite/perfschema/t/ddl_events_waits_current.test index 34f735c1271..1914d333f00 100644 --- a/mysql-test/suite/perfschema/t/ddl_events_waits_current.test +++ b/mysql-test/suite/perfschema/t/ddl_events_waits_current.test @@ -19,13 +19,13 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.EVENTS_WAITS_CURRENT add column foo integer; +alter table performance_schema.events_waits_current add column foo integer; -truncate table performance_schema.EVENTS_WAITS_CURRENT; +truncate table performance_schema.events_waits_current; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.EVENTS_WAITS_CURRENT ADD INDEX test_index(EVENT_ID); +ALTER TABLE performance_schema.events_waits_current ADD INDEX test_index(EVENT_ID); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_CURRENT(EVENT_ID); +CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_current(EVENT_ID); diff --git a/mysql-test/suite/perfschema/t/ddl_events_waits_history.test b/mysql-test/suite/perfschema/t/ddl_events_waits_history.test index 76ebe3d85c4..97c840a350d 100644 --- a/mysql-test/suite/perfschema/t/ddl_events_waits_history.test +++ b/mysql-test/suite/perfschema/t/ddl_events_waits_history.test @@ -19,13 +19,13 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.EVENTS_WAITS_HISTORY add column foo integer; +alter table performance_schema.events_waits_history add column foo integer; -truncate table performance_schema.EVENTS_WAITS_HISTORY; +truncate table performance_schema.events_waits_history; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.EVENTS_WAITS_HISTORY ADD INDEX test_index(EVENT_ID); +ALTER TABLE performance_schema.events_waits_history ADD INDEX test_index(EVENT_ID); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_HISTORY(EVENT_ID); +CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_history(EVENT_ID); diff --git a/mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test b/mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test index 549c5d6880b..b57a3864e1a 100644 --- a/mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test +++ b/mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test @@ -19,13 +19,13 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.EVENTS_WAITS_HISTORY_LONG add column foo integer; +alter table performance_schema.events_waits_history_long add column foo integer; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_history_long; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG ADD INDEX test_index(EVENT_ID); +ALTER TABLE performance_schema.events_waits_history_long ADD INDEX test_index(EVENT_ID); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_HISTORY_LONG(EVENT_ID); +CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_history_long(EVENT_ID); diff --git a/mysql-test/suite/perfschema/t/ddl_ews_by_instance.test b/mysql-test/suite/perfschema/t/ddl_ews_by_instance.test index e6dad07fd63..a6315edd31d 100644 --- a/mysql-test/suite/perfschema/t/ddl_ews_by_instance.test +++ b/mysql-test/suite/perfschema/t/ddl_ews_by_instance.test @@ -19,13 +19,13 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE add column foo integer; +alter table performance_schema.events_waits_summary_by_instance add column foo integer; -truncate table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; +truncate table performance_schema.events_waits_summary_by_instance; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE ADD INDEX test_index(EVENT_NAME); +ALTER TABLE performance_schema.events_waits_summary_by_instance ADD INDEX test_index(EVENT_NAME); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE(EVENT_NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_summary_by_instance(EVENT_NAME); diff --git a/mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test b/mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test index 5b65ec26064..f59daca4b46 100644 --- a/mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test +++ b/mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test @@ -19,15 +19,15 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +alter table performance_schema.events_waits_summary_by_thread_by_event_name add column foo integer; -truncate table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; +truncate table performance_schema.events_waits_summary_by_thread_by_event_name; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME ADD INDEX test_index(THREAD_ID); +ALTER TABLE performance_schema.events_waits_summary_by_thread_by_event_name ADD INDEX test_index(THREAD_ID); -- error ER_DBACCESS_DENIED_ERROR CREATE UNIQUE INDEX test_index - ON performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME(THREAD_ID); + ON performance_schema.events_waits_summary_by_thread_by_event_name(THREAD_ID); diff --git a/mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test b/mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test index c7a767b013b..880b4bf1a59 100644 --- a/mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test +++ b/mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test @@ -19,16 +19,16 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +alter table performance_schema.events_waits_summary_global_by_event_name add column foo integer; -truncate table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; +truncate table performance_schema.events_waits_summary_global_by_event_name; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +ALTER TABLE performance_schema.events_waits_summary_global_by_event_name ADD INDEX test_index(EVENT_NAME); -- error ER_DBACCESS_DENIED_ERROR CREATE UNIQUE INDEX test_index - ON performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME(EVENT_NAME); + ON performance_schema.events_waits_summary_global_by_event_name(EVENT_NAME); diff --git a/mysql-test/suite/perfschema/t/ddl_file_instances.test b/mysql-test/suite/perfschema/t/ddl_file_instances.test index a9c9a2a95b6..9d6b8c3cf26 100644 --- a/mysql-test/suite/perfschema/t/ddl_file_instances.test +++ b/mysql-test/suite/perfschema/t/ddl_file_instances.test @@ -19,14 +19,14 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.FILE_INSTANCES add column foo integer; +alter table performance_schema.file_instances add column foo integer; -- error ER_WRONG_PERFSCHEMA_USAGE -truncate table performance_schema.FILE_INSTANCES; +truncate table performance_schema.file_instances; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.FILE_INSTANCES ADD INDEX test_index(FILE_NAME); +ALTER TABLE performance_schema.file_instances ADD INDEX test_index(FILE_NAME); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.FILE_INSTANCES(FILE_NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.file_instances(FILE_NAME); diff --git a/mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test b/mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test index 2581f07c0d2..f9a9cabb5b2 100644 --- a/mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test +++ b/mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test @@ -19,13 +19,13 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.FILE_SUMMARY_BY_EVENT_NAME add column foo integer; +alter table performance_schema.file_summary_by_event_name add column foo integer; -truncate table performance_schema.FILE_SUMMARY_BY_EVENT_NAME; +truncate table performance_schema.file_summary_by_event_name; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.FILE_SUMMARY_BY_EVENT_NAME ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.file_summary_by_event_name ADD INDEX test_index(NAME); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.FILE_SUMMARY_BY_EVENT_NAME(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.file_summary_by_event_name(NAME); diff --git a/mysql-test/suite/perfschema/t/ddl_fs_by_instance.test b/mysql-test/suite/perfschema/t/ddl_fs_by_instance.test index e06ad2eb7cd..defbff34321 100644 --- a/mysql-test/suite/perfschema/t/ddl_fs_by_instance.test +++ b/mysql-test/suite/perfschema/t/ddl_fs_by_instance.test @@ -19,13 +19,13 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.FILE_SUMMARY_BY_INSTANCE add column foo integer; +alter table performance_schema.file_summary_by_instance add column foo integer; -truncate table performance_schema.FILE_SUMMARY_BY_INSTANCE; +truncate table performance_schema.file_summary_by_instance; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.FILE_SUMMARY_BY_INSTANCE ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.file_summary_by_instance ADD INDEX test_index(NAME); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.FILE_SUMMARY_BY_INSTANCE(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.file_summary_by_instance(NAME); diff --git a/mysql-test/suite/perfschema/t/ddl_mutex_instances.test b/mysql-test/suite/perfschema/t/ddl_mutex_instances.test index 6489a689620..ccd970655af 100644 --- a/mysql-test/suite/perfschema/t/ddl_mutex_instances.test +++ b/mysql-test/suite/perfschema/t/ddl_mutex_instances.test @@ -19,14 +19,14 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.MUTEX_INSTANCES add column foo integer; +alter table performance_schema.mutex_instances add column foo integer; -- error ER_WRONG_PERFSCHEMA_USAGE -truncate table performance_schema.MUTEX_INSTANCES; +truncate table performance_schema.mutex_instances; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.MUTEX_INSTANCES ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.mutex_instances ADD INDEX test_index(NAME); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.MUTEX_INSTANCES(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.mutex_instances(NAME); diff --git a/mysql-test/suite/perfschema/t/ddl_performance_timers.test b/mysql-test/suite/perfschema/t/ddl_performance_timers.test index b692291b8cf..f6fcfd58bab 100644 --- a/mysql-test/suite/perfschema/t/ddl_performance_timers.test +++ b/mysql-test/suite/perfschema/t/ddl_performance_timers.test @@ -19,14 +19,14 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.PERFORMANCE_TIMERS add column foo integer; +alter table performance_schema.performance_timers add column foo integer; -- error ER_WRONG_PERFSCHEMA_USAGE -truncate table performance_schema.PERFORMANCE_TIMERS; +truncate table performance_schema.performance_timers; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.PERFORMANCE_TIMERS ADD INDEX test_index(TIMER_NAME); +ALTER TABLE performance_schema.performance_timers ADD INDEX test_index(TIMER_NAME); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.PERFORMANCE_TIMERS(TIMER_NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.performance_timers(TIMER_NAME); diff --git a/mysql-test/suite/perfschema/t/ddl_rwlock_instances.test b/mysql-test/suite/perfschema/t/ddl_rwlock_instances.test index c07cd1ede48..e5bd8b890a1 100644 --- a/mysql-test/suite/perfschema/t/ddl_rwlock_instances.test +++ b/mysql-test/suite/perfschema/t/ddl_rwlock_instances.test @@ -19,14 +19,14 @@ --source include/have_perfschema.inc -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.RWLOCK_INSTANCES add column foo integer; +alter table performance_schema.rwlock_instances add column foo integer; -- error ER_WRONG_PERFSCHEMA_USAGE -truncate table performance_schema.RWLOCK_INSTANCES; +truncate table performance_schema.rwlock_instances; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.RWLOCK_INSTANCES ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.rwlock_instances ADD INDEX test_index(NAME); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.RWLOCK_INSTANCES(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.rwlock_instances(NAME); diff --git a/mysql-test/suite/perfschema/t/ddl_setup_consumers.test b/mysql-test/suite/perfschema/t/ddl_setup_consumers.test index c44db822145..3984e0b7fab 100644 --- a/mysql-test/suite/perfschema/t/ddl_setup_consumers.test +++ b/mysql-test/suite/perfschema/t/ddl_setup_consumers.test @@ -18,16 +18,15 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_result '\'setup_consumers' '\'SETUP_CONSUMERS' -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.SETUP_CONSUMERS add column foo integer; +alter table performance_schema.setup_consumers add column foo integer; -- error ER_WRONG_PERFSCHEMA_USAGE -truncate table performance_schema.SETUP_CONSUMERS; +truncate table performance_schema.setup_consumers; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.SETUP_CONSUMERS ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.setup_consumers ADD INDEX test_index(NAME); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.SETUP_CONSUMERS(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.setup_consumers(NAME); diff --git a/mysql-test/suite/perfschema/t/ddl_setup_instruments.test b/mysql-test/suite/perfschema/t/ddl_setup_instruments.test index c20c386447c..b900f69e801 100644 --- a/mysql-test/suite/perfschema/t/ddl_setup_instruments.test +++ b/mysql-test/suite/perfschema/t/ddl_setup_instruments.test @@ -18,16 +18,15 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS' -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.SETUP_INSTRUMENTS add column foo integer; +alter table performance_schema.setup_instruments add column foo integer; -- error ER_WRONG_PERFSCHEMA_USAGE -truncate table performance_schema.SETUP_INSTRUMENTS; +truncate table performance_schema.setup_instruments; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.SETUP_INSTRUMENTS ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.setup_instruments ADD INDEX test_index(NAME); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.SETUP_INSTRUMENTS(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.setup_instruments(NAME); diff --git a/mysql-test/suite/perfschema/t/ddl_setup_timers.test b/mysql-test/suite/perfschema/t/ddl_setup_timers.test index b9a5c32ecbe..bf8878a496d 100644 --- a/mysql-test/suite/perfschema/t/ddl_setup_timers.test +++ b/mysql-test/suite/perfschema/t/ddl_setup_timers.test @@ -18,16 +18,15 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_result '\'setup_timers' '\'SETUP_TIMERS' -- error ER_DBACCESS_DENIED_ERROR -alter table performance_schema.SETUP_TIMERS add column foo integer; +alter table performance_schema.setup_timers add column foo integer; -- error ER_WRONG_PERFSCHEMA_USAGE -truncate table performance_schema.SETUP_TIMERS; +truncate table performance_schema.setup_timers; -- error ER_DBACCESS_DENIED_ERROR -ALTER TABLE performance_schema.SETUP_TIMERS ADD INDEX test_index(NAME); +ALTER TABLE performance_schema.setup_timers ADD INDEX test_index(NAME); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.SETUP_TIMERS(NAME); +CREATE UNIQUE INDEX test_index ON performance_schema.setup_timers(NAME); diff --git a/mysql-test/suite/perfschema/t/ddl_threads.test b/mysql-test/suite/perfschema/t/ddl_threads.test index 12613e30c1f..d9ff3356b8d 100644 --- a/mysql-test/suite/perfschema/t/ddl_threads.test +++ b/mysql-test/suite/perfschema/t/ddl_threads.test @@ -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(ID); +ALTER TABLE performance_schema.threads ADD INDEX test_index(ID); -- error ER_DBACCESS_DENIED_ERROR -CREATE UNIQUE INDEX test_index ON performance_schema.THREADS(ID); +CREATE UNIQUE INDEX test_index ON performance_schema.threads(ID); diff --git a/mysql-test/suite/perfschema/t/dml_cond_instances.test b/mysql-test/suite/perfschema/t/dml_cond_instances.test index 1d1614db73f..528dae80dfa 100644 --- a/mysql-test/suite/perfschema/t/dml_cond_instances.test +++ b/mysql-test/suite/perfschema/t/dml_cond_instances.test @@ -19,37 +19,31 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # -select * from performance_schema.COND_INSTANCES limit 1; +select * from performance_schema.cond_instances limit 1; -select * from performance_schema.COND_INSTANCES +select * from performance_schema.cond_instances where name='FOO'; ---replace_result '\'cond_instances' '\'COND_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.COND_INSTANCES +insert into performance_schema.cond_instances set name='FOO', object_instance_begin=12; ---replace_result '\'cond_instances' '\'COND_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.COND_INSTANCES +update performance_schema.cond_instances set name='FOO'; ---replace_result '\'cond_instances' '\'COND_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.COND_INSTANCES +delete from performance_schema.cond_instances where name like "wait/%"; ---replace_result '\'cond_instances' '\'COND_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.COND_INSTANCES; +delete from performance_schema.cond_instances; ---replace_result '\'cond_instances' '\'COND_INSTANCES' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.COND_INSTANCES READ; +LOCK TABLES performance_schema.cond_instances READ; UNLOCK TABLES; ---replace_result '\'cond_instances' '\'COND_INSTANCES' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.COND_INSTANCES WRITE; +LOCK TABLES performance_schema.cond_instances WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_events_waits_current.test b/mysql-test/suite/perfschema/t/dml_events_waits_current.test index 3a93b98cb57..f82fac63df9 100644 --- a/mysql-test/suite/perfschema/t/dml_events_waits_current.test +++ b/mysql-test/suite/perfschema/t/dml_events_waits_current.test @@ -19,44 +19,37 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # -select * from performance_schema.EVENTS_WAITS_CURRENT +select * from performance_schema.events_waits_current where event_name like 'Wait/Synch/%' limit 1; -select * from performance_schema.EVENTS_WAITS_CURRENT +select * from performance_schema.events_waits_current where event_name='FOO'; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.EVENTS_WAITS_CURRENT +insert into performance_schema.events_waits_current set thread_id='1', event_id=1, event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.EVENTS_WAITS_CURRENT +update performance_schema.events_waits_current set timer_start=12; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.EVENTS_WAITS_CURRENT +update performance_schema.events_waits_current set timer_start=12 where thread_id=0; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.EVENTS_WAITS_CURRENT +delete from performance_schema.events_waits_current where thread_id=1; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.EVENTS_WAITS_CURRENT; +delete from performance_schema.events_waits_current; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.EVENTS_WAITS_CURRENT READ; +LOCK TABLES performance_schema.events_waits_current READ; UNLOCK TABLES; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.EVENTS_WAITS_CURRENT WRITE; +LOCK TABLES performance_schema.events_waits_current WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_events_waits_history.test b/mysql-test/suite/perfschema/t/dml_events_waits_history.test index 174ef2147d1..865d261d7f9 100644 --- a/mysql-test/suite/perfschema/t/dml_events_waits_history.test +++ b/mysql-test/suite/perfschema/t/dml_events_waits_history.test @@ -19,52 +19,45 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # -select * from performance_schema.EVENTS_WAITS_HISTORY +select * from performance_schema.events_waits_history where event_name like 'Wait/Synch/%' limit 1; -select * from performance_schema.EVENTS_WAITS_HISTORY +select * from performance_schema.events_waits_history where event_name='FOO'; --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # -select * from performance_schema.EVENTS_WAITS_HISTORY +select * from performance_schema.events_waits_history where event_name like 'Wait/Synch/%' order by timer_wait limit 1; --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # -select * from performance_schema.EVENTS_WAITS_HISTORY +select * from performance_schema.events_waits_history where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1; ---replace_result '\'events_waits_history' '\'EVENTS_WAITS_HISTORY' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.EVENTS_WAITS_HISTORY +insert into performance_schema.events_waits_history set thread_id='1', event_id=1, event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; ---replace_result '\'events_waits_history' '\'EVENTS_WAITS_HISTORY' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.EVENTS_WAITS_HISTORY +update performance_schema.events_waits_history set timer_start=12; ---replace_result '\'events_waits_history' '\'EVENTS_WAITS_HISTORY' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.EVENTS_WAITS_HISTORY +update performance_schema.events_waits_history set timer_start=12 where thread_id=0; ---replace_result '\'events_waits_history' '\'EVENTS_WAITS_HISTORY' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.EVENTS_WAITS_HISTORY +delete from performance_schema.events_waits_history where thread_id=1; ---replace_result '\'events_waits_history' '\'EVENTS_WAITS_HISTORY' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.EVENTS_WAITS_HISTORY; +delete from performance_schema.events_waits_history; ---replace_result '\'events_waits_history' '\'EVENTS_WAITS_HISTORY' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY READ; +LOCK TABLES performance_schema.events_waits_history READ; UNLOCK TABLES; ---replace_result '\'events_waits_history' '\'EVENTS_WAITS_HISTORY' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY WRITE; +LOCK TABLES performance_schema.events_waits_history WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test b/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test index 73dc0aefd06..606e33b3e80 100644 --- a/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test +++ b/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test @@ -19,52 +19,45 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG +select * from performance_schema.events_waits_history_long where event_name like 'Wait/Synch/%' limit 1; -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG +select * from performance_schema.events_waits_history_long where event_name='FOO'; --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG +select * from performance_schema.events_waits_history_long where event_name like 'Wait/Synch/%' order by timer_wait limit 1; --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # -select * from performance_schema.EVENTS_WAITS_HISTORY_LONG +select * from performance_schema.events_waits_history_long where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1; ---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.EVENTS_WAITS_HISTORY_LONG +insert into performance_schema.events_waits_history_long set thread_id='1', event_id=1, event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; ---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.EVENTS_WAITS_HISTORY_LONG +update performance_schema.events_waits_history_long set timer_start=12; ---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.EVENTS_WAITS_HISTORY_LONG +update performance_schema.events_waits_history_long set timer_start=12 where thread_id=0; ---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.EVENTS_WAITS_HISTORY_LONG +delete from performance_schema.events_waits_history_long where thread_id=1; ---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.EVENTS_WAITS_HISTORY_LONG; +delete from performance_schema.events_waits_history_long; ---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY_LONG READ; +LOCK TABLES performance_schema.events_waits_history_long READ; UNLOCK TABLES; ---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY_LONG WRITE; +LOCK TABLES performance_schema.events_waits_history_long WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_ews_by_instance.test b/mysql-test/suite/perfschema/t/dml_ews_by_instance.test index 4c386313bc5..2e4ab9bcc74 100644 --- a/mysql-test/suite/perfschema/t/dml_ews_by_instance.test +++ b/mysql-test/suite/perfschema/t/dml_ews_by_instance.test @@ -19,61 +19,54 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +select * from performance_schema.events_waits_summary_by_instance where event_name like 'Wait/Synch/%' limit 1; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +select * from performance_schema.events_waits_summary_by_instance where event_name='FOO'; --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +select * from performance_schema.events_waits_summary_by_instance order by count_star limit 1; --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +select * from performance_schema.events_waits_summary_by_instance order by count_star desc limit 1; --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +select * from performance_schema.events_waits_summary_by_instance where min_timer_wait > 0 order by count_star limit 1; --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +select * from performance_schema.events_waits_summary_by_instance where min_timer_wait > 0 order by count_star desc limit 1; ---replace_result '\'events_waits_summary_by_instance' '\'EVENTS_WAITS_SUMMARY_BY_INSTANCE' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +insert into performance_schema.events_waits_summary_by_instance set event_name='FOO', object_instance_begin=0, count_star=1, sum_timer_wait=2, min_timer_wait=3, avg_timer_wait=4, max_timer_wait=5; ---replace_result '\'events_waits_summary_by_instance' '\'EVENTS_WAITS_SUMMARY_BY_INSTANCE' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +update performance_schema.events_waits_summary_by_instance set count_star=12; ---replace_result '\'events_waits_summary_by_instance' '\'EVENTS_WAITS_SUMMARY_BY_INSTANCE' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +update performance_schema.events_waits_summary_by_instance set count_star=12 where event_name like "FOO"; ---replace_result '\'events_waits_summary_by_instance' '\'EVENTS_WAITS_SUMMARY_BY_INSTANCE' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE +delete from performance_schema.events_waits_summary_by_instance where count_star=1; ---replace_result '\'events_waits_summary_by_instance' '\'EVENTS_WAITS_SUMMARY_BY_INSTANCE' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; +delete from performance_schema.events_waits_summary_by_instance; ---replace_result '\'events_waits_summary_by_instance' '\'EVENTS_WAITS_SUMMARY_BY_INSTANCE' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE READ; +LOCK TABLES performance_schema.events_waits_summary_by_instance READ; UNLOCK TABLES; ---replace_result '\'events_waits_summary_by_instance' '\'EVENTS_WAITS_SUMMARY_BY_INSTANCE' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE WRITE; +LOCK TABLES performance_schema.events_waits_summary_by_instance WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test b/mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test index ce29e59d014..bdbee9a90c1 100644 --- a/mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test @@ -19,45 +19,38 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +select * from performance_schema.events_waits_summary_by_thread_by_event_name where event_name like 'Wait/Synch/%' limit 1; -select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +select * from performance_schema.events_waits_summary_by_thread_by_event_name where event_name='FOO'; ---replace_result '\'events_waits_summary_by_thread_by_event_name' '\'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +insert into performance_schema.events_waits_summary_by_thread_by_event_name set event_name='FOO', thread_id=1, count_star=1, sum_timer_wait=2, min_timer_wait=3, avg_timer_wait=4, max_timer_wait=5; ---replace_result '\'events_waits_summary_by_thread_by_event_name' '\'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +update performance_schema.events_waits_summary_by_thread_by_event_name set count_star=12; ---replace_result '\'events_waits_summary_by_thread_by_event_name' '\'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +update performance_schema.events_waits_summary_by_thread_by_event_name set count_star=12 where event_name like "FOO"; ---replace_result '\'events_waits_summary_by_thread_by_event_name' '\'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME +delete from performance_schema.events_waits_summary_by_thread_by_event_name where count_star=1; ---replace_result '\'events_waits_summary_by_thread_by_event_name' '\'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; +delete from performance_schema.events_waits_summary_by_thread_by_event_name; ---replace_result '\'events_waits_summary_by_thread_by_event_name' '\'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME READ; +LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name READ; UNLOCK TABLES; ---replace_result '\'events_waits_summary_by_thread_by_event_name' '\'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME WRITE; +LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test b/mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test index cd3918f38be..4f1b50bb7c0 100644 --- a/mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test @@ -19,44 +19,37 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # 3 # 4 # 5 # 6 # -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +select * from performance_schema.events_waits_summary_global_by_event_name where event_name like 'Wait/Synch/%' limit 1; -select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +select * from performance_schema.events_waits_summary_global_by_event_name where event_name='FOO'; ---replace_result '\'events_waits_summary_global_by_event_name' '\'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +insert into performance_schema.events_waits_summary_global_by_event_name set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3, avg_timer_wait=4, max_timer_wait=5; ---replace_result '\'events_waits_summary_global_by_event_name' '\'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +update performance_schema.events_waits_summary_global_by_event_name set count_star=12; ---replace_result '\'events_waits_summary_global_by_event_name' '\'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +update performance_schema.events_waits_summary_global_by_event_name set count_star=12 where event_name like "FOO"; ---replace_result '\'events_waits_summary_global_by_event_name' '\'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +delete from performance_schema.events_waits_summary_global_by_event_name where count_star=1; ---replace_result '\'events_waits_summary_global_by_event_name' '\'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; +delete from performance_schema.events_waits_summary_global_by_event_name; ---replace_result '\'events_waits_summary_global_by_event_name' '\'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME READ; +LOCK TABLES performance_schema.events_waits_summary_global_by_event_name READ; UNLOCK TABLES; ---replace_result '\'events_waits_summary_global_by_event_name' '\'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME WRITE; +LOCK TABLES performance_schema.events_waits_summary_global_by_event_name WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_file_instances.test b/mysql-test/suite/perfschema/t/dml_file_instances.test index 71a053c21be..f3a13eaee32 100644 --- a/mysql-test/suite/perfschema/t/dml_file_instances.test +++ b/mysql-test/suite/perfschema/t/dml_file_instances.test @@ -19,37 +19,31 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # 3 # -select * from performance_schema.FILE_INSTANCES limit 1; +select * from performance_schema.file_instances limit 1; -select * from performance_schema.FILE_INSTANCES +select * from performance_schema.file_instances where file_name='FOO'; ---replace_result '\'file_instances' '\'FILE_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.FILE_INSTANCES +insert into performance_schema.file_instances set file_name='FOO', event_name='BAR', open_count=12; ---replace_result '\'file_instances' '\'FILE_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.FILE_INSTANCES +update performance_schema.file_instances set file_name='FOO'; ---replace_result '\'file_instances' '\'FILE_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.FILE_INSTANCES +delete from performance_schema.file_instances where event_name like "wait/%"; ---replace_result '\'file_instances' '\'FILE_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.FILE_INSTANCES; +delete from performance_schema.file_instances; ---replace_result '\'file_instances' '\'FILE_INSTANCES' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.FILE_INSTANCES READ; +LOCK TABLES performance_schema.file_instances READ; UNLOCK TABLES; ---replace_result '\'file_instances' '\'FILE_INSTANCES' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.FILE_INSTANCES WRITE; +LOCK TABLES performance_schema.file_instances WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test b/mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test index 3753f581560..f5e1f90e9c9 100644 --- a/mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test +++ b/mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test @@ -19,44 +19,37 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # 3 # 4 # 5 # -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME +select * from performance_schema.file_summary_by_event_name where event_name like 'Wait/io/%' limit 1; -select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME +select * from performance_schema.file_summary_by_event_name where event_name='FOO'; ---replace_result '\'file_summary_by_event_name' '\'FILE_SUMMARY_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.FILE_SUMMARY_BY_EVENT_NAME +insert into performance_schema.file_summary_by_event_name set event_name='FOO', count_read=1, count_write=2, sum_number_of_bytes_read=4, sum_number_of_bytes_write=5; ---replace_result '\'file_summary_by_event_name' '\'FILE_SUMMARY_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.FILE_SUMMARY_BY_EVENT_NAME +update performance_schema.file_summary_by_event_name set count_read=12; ---replace_result '\'file_summary_by_event_name' '\'FILE_SUMMARY_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.FILE_SUMMARY_BY_EVENT_NAME +update performance_schema.file_summary_by_event_name set count_write=12 where event_name like "FOO"; ---replace_result '\'file_summary_by_event_name' '\'FILE_SUMMARY_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.FILE_SUMMARY_BY_EVENT_NAME +delete from performance_schema.file_summary_by_event_name where count_read=1; ---replace_result '\'file_summary_by_event_name' '\'FILE_SUMMARY_BY_EVENT_NAME' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; +delete from performance_schema.file_summary_by_event_name; ---replace_result '\'file_summary_by_event_name' '\'FILE_SUMMARY_BY_EVENT_NAME' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.FILE_SUMMARY_BY_EVENT_NAME READ; +LOCK TABLES performance_schema.file_summary_by_event_name READ; UNLOCK TABLES; ---replace_result '\'file_summary_by_event_name' '\'FILE_SUMMARY_BY_EVENT_NAME' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.FILE_SUMMARY_BY_EVENT_NAME WRITE; +LOCK TABLES performance_schema.file_summary_by_event_name WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test b/mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test index 07372af5f36..2ac32b97f56 100644 --- a/mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test +++ b/mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test @@ -19,44 +19,37 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # 3 # 4 # 5 # 6 # -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE +select * from performance_schema.file_summary_by_instance where event_name like 'Wait/io/%' limit 1; -select * from performance_schema.FILE_SUMMARY_BY_INSTANCE +select * from performance_schema.file_summary_by_instance where event_name='FOO'; ---replace_result '\'file_summary_by_instance' '\'FILE_SUMMARY_BY_INSTANCE' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.FILE_SUMMARY_BY_INSTANCE +insert into performance_schema.file_summary_by_instance set event_name='FOO', count_read=1, count_write=2, sum_number_of_bytes_read=4, sum_number_of_bytes_write=5; ---replace_result '\'file_summary_by_instance' '\'FILE_SUMMARY_BY_INSTANCE' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.FILE_SUMMARY_BY_INSTANCE +update performance_schema.file_summary_by_instance set count_read=12; ---replace_result '\'file_summary_by_instance' '\'FILE_SUMMARY_BY_INSTANCE' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.FILE_SUMMARY_BY_INSTANCE +update performance_schema.file_summary_by_instance set count_write=12 where event_name like "FOO"; ---replace_result '\'file_summary_by_instance' '\'FILE_SUMMARY_BY_INSTANCE' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.FILE_SUMMARY_BY_INSTANCE +delete from performance_schema.file_summary_by_instance where count_read=1; ---replace_result '\'file_summary_by_instance' '\'FILE_SUMMARY_BY_INSTANCE' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.FILE_SUMMARY_BY_INSTANCE; +delete from performance_schema.file_summary_by_instance; ---replace_result '\'file_summary_by_instance' '\'FILE_SUMMARY_BY_INSTANCE' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.FILE_SUMMARY_BY_INSTANCE READ; +LOCK TABLES performance_schema.file_summary_by_instance READ; UNLOCK TABLES; ---replace_result '\'file_summary_by_instance' '\'FILE_SUMMARY_BY_INSTANCE' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.FILE_SUMMARY_BY_INSTANCE WRITE; +LOCK TABLES performance_schema.file_summary_by_instance WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_mutex_instances.test b/mysql-test/suite/perfschema/t/dml_mutex_instances.test index 0971c664eb8..c0bbd5276a0 100644 --- a/mysql-test/suite/perfschema/t/dml_mutex_instances.test +++ b/mysql-test/suite/perfschema/t/dml_mutex_instances.test @@ -19,37 +19,31 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # 3 # -select * from performance_schema.MUTEX_INSTANCES limit 1; +select * from performance_schema.mutex_instances limit 1; -select * from performance_schema.MUTEX_INSTANCES +select * from performance_schema.mutex_instances where name='FOO'; ---replace_result '\'mutex_instances' '\'MUTEX_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.MUTEX_INSTANCES +insert into performance_schema.mutex_instances set name='FOO', object_instance_begin=12; ---replace_result '\'mutex_instances' '\'MUTEX_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.MUTEX_INSTANCES +update performance_schema.mutex_instances set name='FOO'; ---replace_result '\'mutex_instances' '\'MUTEX_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.MUTEX_INSTANCES +delete from performance_schema.mutex_instances where name like "wait/%"; ---replace_result '\'mutex_instances' '\'MUTEX_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.MUTEX_INSTANCES; +delete from performance_schema.mutex_instances; ---replace_result '\'mutex_instances' '\'MUTEX_INSTANCES' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.MUTEX_INSTANCES READ; +LOCK TABLES performance_schema.mutex_instances READ; UNLOCK TABLES; ---replace_result '\'mutex_instances' '\'MUTEX_INSTANCES' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.MUTEX_INSTANCES WRITE; +LOCK TABLES performance_schema.mutex_instances WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_performance_timers.test b/mysql-test/suite/perfschema/t/dml_performance_timers.test index 9c2efb6f709..211e6db4fb1 100644 --- a/mysql-test/suite/perfschema/t/dml_performance_timers.test +++ b/mysql-test/suite/perfschema/t/dml_performance_timers.test @@ -19,39 +19,33 @@ --source include/have_perfschema.inc --replace_column 2 <frequency> 3 <resolution> 4 <overhead> -select * from performance_schema.PERFORMANCE_TIMERS; +select * from performance_schema.performance_timers; --replace_column 2 <frequency> 3 <resolution> 4 <overhead> -select * from performance_schema.PERFORMANCE_TIMERS +select * from performance_schema.performance_timers where timer_name='CYCLE'; ---replace_result '\'performance_timers' '\'PERFORMANCE_TIMERS' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.PERFORMANCE_TIMERS +insert into performance_schema.performance_timers set timer_name='FOO', timer_frequency=1, timer_resolution=2, timer_overhead=3; ---replace_result '\'performance_timers' '\'PERFORMANCE_TIMERS' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.PERFORMANCE_TIMERS +update performance_schema.performance_timers set timer_frequency=12 where timer_name='CYCLE'; ---replace_result '\'performance_timers' '\'PERFORMANCE_TIMERS' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.PERFORMANCE_TIMERS; +delete from performance_schema.performance_timers; ---replace_result '\'performance_timers' '\'PERFORMANCE_TIMERS' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.PERFORMANCE_TIMERS +delete from performance_schema.performance_timers where timer_name='CYCLE'; ---replace_result '\'performance_timers' '\'PERFORMANCE_TIMERS' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.PERFORMANCE_TIMERS READ; +LOCK TABLES performance_schema.performance_timers READ; UNLOCK TABLES; ---replace_result '\'performance_timers' '\'PERFORMANCE_TIMERS' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.PERFORMANCE_TIMERS WRITE; +LOCK TABLES performance_schema.performance_timers WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_rwlock_instances.test b/mysql-test/suite/perfschema/t/dml_rwlock_instances.test index 33a42450681..c0fd89a8e75 100644 --- a/mysql-test/suite/perfschema/t/dml_rwlock_instances.test +++ b/mysql-test/suite/perfschema/t/dml_rwlock_instances.test @@ -19,37 +19,31 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # 3 # 4 # -select * from performance_schema.RWLOCK_INSTANCES limit 1; +select * from performance_schema.rwlock_instances limit 1; -select * from performance_schema.RWLOCK_INSTANCES +select * from performance_schema.rwlock_instances where name='FOO'; ---replace_result '\'rwlock_instances' '\'RWLOCK_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.RWLOCK_INSTANCES +insert into performance_schema.rwlock_instances set name='FOO', object_instance_begin=12; ---replace_result '\'rwlock_instances' '\'RWLOCK_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.RWLOCK_INSTANCES +update performance_schema.rwlock_instances set name='FOO'; ---replace_result '\'rwlock_instances' '\'RWLOCK_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.RWLOCK_INSTANCES +delete from performance_schema.rwlock_instances where name like "wait/%"; ---replace_result '\'rwlock_instances' '\'RWLOCK_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.RWLOCK_INSTANCES; +delete from performance_schema.rwlock_instances; ---replace_result '\'rwlock_instances' '\'RWLOCK_INSTANCES' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.RWLOCK_INSTANCES READ; +LOCK TABLES performance_schema.rwlock_instances READ; UNLOCK TABLES; ---replace_result '\'rwlock_instances' '\'RWLOCK_INSTANCES' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.RWLOCK_INSTANCES WRITE; +LOCK TABLES performance_schema.rwlock_instances WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_setup_consumers.test b/mysql-test/suite/perfschema/t/dml_setup_consumers.test index 85b65864f91..2a29f428f3d 100644 --- a/mysql-test/suite/perfschema/t/dml_setup_consumers.test +++ b/mysql-test/suite/perfschema/t/dml_setup_consumers.test @@ -18,42 +18,38 @@ --source include/not_embedded.inc --source include/have_perfschema.inc -select * from performance_schema.SETUP_CONSUMERS; +select * from performance_schema.setup_consumers; -select * from performance_schema.SETUP_CONSUMERS +select * from performance_schema.setup_consumers where name='events_waits_current'; -select * from performance_schema.SETUP_CONSUMERS +select * from performance_schema.setup_consumers where enabled='YES'; -select * from performance_schema.SETUP_CONSUMERS +select * from performance_schema.setup_consumers where enabled='NO'; ---replace_result '\'setup_consumers' '\'SETUP_CONSUMERS' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.SETUP_CONSUMERS +insert into performance_schema.setup_consumers set name='FOO', enabled='YES'; ---replace_result '\'setup_consumers' '\'SETUP_CONSUMERS' --error ER_WRONG_PERFSCHEMA_USAGE -update performance_schema.SETUP_CONSUMERS +update performance_schema.setup_consumers set name='FOO'; -update performance_schema.SETUP_CONSUMERS +update performance_schema.setup_consumers set enabled='YES'; ---replace_result '\'setup_consumers' '\'SETUP_CONSUMERS' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.SETUP_CONSUMERS; +delete from performance_schema.setup_consumers; ---replace_result '\'setup_consumers' '\'SETUP_CONSUMERS' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.SETUP_CONSUMERS +delete from performance_schema.setup_consumers where name='events_waits_current'; -LOCK TABLES performance_schema.SETUP_CONSUMERS READ; +LOCK TABLES performance_schema.setup_consumers READ; UNLOCK TABLES; -LOCK TABLES performance_schema.SETUP_CONSUMERS WRITE; +LOCK TABLES performance_schema.setup_consumers WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_setup_instruments.test b/mysql-test/suite/perfschema/t/dml_setup_instruments.test index b82cde15fb5..b6e28440758 100644 --- a/mysql-test/suite/perfschema/t/dml_setup_instruments.test +++ b/mysql-test/suite/perfschema/t/dml_setup_instruments.test @@ -26,19 +26,19 @@ # - valgrind coverage --disable_result_log -select * from performance_schema.SETUP_INSTRUMENTS; +select * from performance_schema.setup_instruments; --enable_result_log # DEBUG_SYNC::mutex is dependent on the build (DEBUG only) -select * from performance_schema.SETUP_INSTRUMENTS +select * from performance_schema.setup_instruments where name like 'Wait/Synch/Mutex/sql/%' and name not in ('wait/synch/mutex/sql/DEBUG_SYNC::mutex') order by name limit 10; # CRYPTO_dynlock_value::lock is dependent on the build (SSL) -select * from performance_schema.SETUP_INSTRUMENTS +select * from performance_schema.setup_instruments where name like 'Wait/Synch/Rwlock/sql/%' and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock') order by name limit 10; @@ -46,7 +46,7 @@ select * from performance_schema.SETUP_INSTRUMENTS # COND_handler_count is dependent on the build (Windows only) # DEBUG_SYNC::cond is dependent on the build (DEBUG only) -select * from performance_schema.SETUP_INSTRUMENTS +select * from performance_schema.setup_instruments where name like 'Wait/Synch/Cond/sql/%' and name not in ( 'wait/synch/cond/sql/COND_handler_count', @@ -54,50 +54,46 @@ select * from performance_schema.SETUP_INSTRUMENTS order by name limit 10; --disable_result_log -select * from performance_schema.SETUP_INSTRUMENTS +select * from performance_schema.setup_instruments where name='Wait'; --enable_result_log --disable_result_log -select * from performance_schema.SETUP_INSTRUMENTS +select * from performance_schema.setup_instruments where enabled='YES'; --enable_result_log ---replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.SETUP_INSTRUMENTS +insert into performance_schema.setup_instruments set name='FOO', enabled='YES', timed='YES'; ---replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS' --error ER_WRONG_PERFSCHEMA_USAGE -update performance_schema.SETUP_INSTRUMENTS +update performance_schema.setup_instruments set name='FOO'; -update performance_schema.SETUP_INSTRUMENTS +update performance_schema.setup_instruments set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS +update performance_schema.setup_instruments set timed='NO'; --disable_result_log -select * from performance_schema.SETUP_INSTRUMENTS; +select * from performance_schema.setup_instruments; --enable_result_log -update performance_schema.SETUP_INSTRUMENTS +update performance_schema.setup_instruments set enabled='YES', timed='YES'; ---replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.SETUP_INSTRUMENTS; +delete from performance_schema.setup_instruments; ---replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.SETUP_INSTRUMENTS +delete from performance_schema.setup_instruments where name like 'Wait/Synch/%'; -LOCK TABLES performance_schema.SETUP_INSTRUMENTS READ; +LOCK TABLES performance_schema.setup_instruments READ; UNLOCK TABLES; -LOCK TABLES performance_schema.SETUP_INSTRUMENTS WRITE; +LOCK TABLES performance_schema.setup_instruments WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_setup_timers.test b/mysql-test/suite/perfschema/t/dml_setup_timers.test index 5b5850db575..1bfc0ab83a2 100644 --- a/mysql-test/suite/perfschema/t/dml_setup_timers.test +++ b/mysql-test/suite/perfschema/t/dml_setup_timers.test @@ -18,44 +18,40 @@ --source include/not_embedded.inc --source include/have_perfschema.inc -select * from performance_schema.SETUP_TIMERS; +select * from performance_schema.setup_timers; -select * from performance_schema.SETUP_TIMERS +select * from performance_schema.setup_timers where name='Wait'; -select * from performance_schema.SETUP_TIMERS +select * from performance_schema.setup_timers where timer_name='CYCLE'; ---replace_result '\'setup_timers' '\'SETUP_TIMERS' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.SETUP_TIMERS +insert into performance_schema.setup_timers set name='FOO', timer_name='CYCLE'; ---replace_result '\'setup_timers' '\'SETUP_TIMERS' --error ER_WRONG_PERFSCHEMA_USAGE -update performance_schema.SETUP_TIMERS +update performance_schema.setup_timers set name='FOO'; -update performance_schema.SETUP_TIMERS +update performance_schema.setup_timers set timer_name='MILLISECOND'; -select * from performance_schema.SETUP_TIMERS; +select * from performance_schema.setup_timers; -update performance_schema.SETUP_TIMERS +update performance_schema.setup_timers set timer_name='CYCLE'; ---replace_result '\'setup_timers' '\'SETUP_TIMERS' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.SETUP_TIMERS; +delete from performance_schema.setup_timers; ---replace_result '\'setup_timers' '\'SETUP_TIMERS' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.SETUP_TIMERS +delete from performance_schema.setup_timers where name='Wait'; -LOCK TABLES performance_schema.SETUP_TIMERS READ; +LOCK TABLES performance_schema.setup_timers READ; UNLOCK TABLES; -LOCK TABLES performance_schema.SETUP_TIMERS WRITE; +LOCK TABLES performance_schema.setup_timers WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/dml_threads.test b/mysql-test/suite/perfschema/t/dml_threads.test index b6a65b57733..e7188497061 100644 --- a/mysql-test/suite/perfschema/t/dml_threads.test +++ b/mysql-test/suite/perfschema/t/dml_threads.test @@ -19,43 +19,36 @@ --source include/have_perfschema.inc --replace_column 1 # 2 # 3 # -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'; ---replace_result '\'threads' '\'THREADS' --error ER_TABLEACCESS_DENIED_ERROR -insert into performance_schema.THREADS +insert into performance_schema.threads set name='FOO', thread_id=1, processlist_id=2; ---replace_result '\'threads' '\'THREADS' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.THREADS +update performance_schema.threads set thread_id=12; ---replace_result '\'threads' '\'THREADS' --error ER_TABLEACCESS_DENIED_ERROR -update performance_schema.THREADS +update performance_schema.threads set thread_id=12 where name like "FOO"; ---replace_result '\'threads' '\'THREADS' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.THREADS +delete from performance_schema.threads where id=1; ---replace_result '\'threads' '\'THREADS' --error ER_TABLEACCESS_DENIED_ERROR -delete from performance_schema.THREADS; +delete from performance_schema.threads; ---replace_result '\'threads' '\'THREADS' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.THREADS READ; +LOCK TABLES performance_schema.threads READ; UNLOCK TABLES; ---replace_result '\'threads' '\'THREADS' -- error ER_TABLEACCESS_DENIED_ERROR -LOCK TABLES performance_schema.THREADS WRITE; +LOCK TABLES performance_schema.threads WRITE; UNLOCK TABLES; diff --git a/mysql-test/suite/perfschema/t/func_file_io.test b/mysql-test/suite/perfschema/t/func_file_io.test index dc9a7a09e40..911f97b5d6c 100644 --- a/mysql-test/suite/perfschema/t/func_file_io.test +++ b/mysql-test/suite/perfschema/t/func_file_io.test @@ -22,9 +22,9 @@ --source include/not_embedded.inc --source include/have_perfschema.inc -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO', timed = 'YES'; +UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' +UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/io/file/%'; --disable_warnings @@ -40,9 +40,9 @@ ENGINE=MyISAM; INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8); -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; # # FF1: Count for file should increase with instrumentation enabled and @@ -52,7 +52,7 @@ TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; SELECT * FROM t1 WHERE id = 1; SET @before_count = (SELECT SUM(TIMER_WAIT) - FROM performance_schema.EVENTS_WAITS_HISTORY_LONG + FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile') AND (OBJECT_NAME LIKE '%t1.MYD')); @@ -61,23 +61,23 @@ SELECT IF(@before_count > 0, 'Success', 'Failure') has_instrumentation; SELECT * FROM t1 WHERE id < 4; SET @after_count = (SELECT SUM(TIMER_WAIT) - FROM performance_schema.EVENTS_WAITS_HISTORY_LONG + FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile') AND (OBJECT_NAME LIKE '%t1.MYD') AND (1 = 1)); SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_ff1_timed; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled='NO'; +UPDATE performance_schema.setup_instruments SET enabled='NO'; SET @before_count = (SELECT SUM(TIMER_WAIT) - FROM performance_schema.EVENTS_WAITS_HISTORY_LONG + FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile') AND (OBJECT_NAME LIKE '%t1.MYD') AND (2 = 2)); SELECT * FROM t1 WHERE id < 6; SET @after_count = (SELECT SUM(TIMER_WAIT) - FROM performance_schema.EVENTS_WAITS_HISTORY_LONG + FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile') AND (OBJECT_NAME LIKE '%t1.MYD') AND (3 = 3)); @@ -87,33 +87,33 @@ SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success # Check not timed measurements # -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' +UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/io/file/%'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET timed = 'NO'; +UPDATE performance_schema.setup_instruments SET timed = 'NO'; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; SELECT * FROM t1 WHERE id > 4; -SELECT * FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +SELECT * FROM performance_schema.events_waits_history_long WHERE TIMER_WAIT != NULL OR TIMER_START != NULL OR TIMER_END != NULL; -SELECT * FROM performance_schema.EVENTS_WAITS_HISTORY +SELECT * FROM performance_schema.events_waits_history WHERE TIMER_WAIT != NULL OR TIMER_START != NULL OR TIMER_END != NULL; -SELECT * FROM performance_schema.EVENTS_WAITS_CURRENT +SELECT * FROM performance_schema.events_waits_current WHERE TIMER_WAIT != NULL OR TIMER_START != NULL OR TIMER_END != NULL; -UPDATE performance_schema.SETUP_INSTRUMENTS SET timed = 'YES'; +UPDATE performance_schema.setup_instruments SET timed = 'YES'; SELECT * FROM t1 WHERE id < 4; @@ -128,7 +128,7 @@ SELECT SUM(COUNT_READ) AS sum_count_read, SUM(COUNT_WRITE) AS sum_count_write, SUM(SUM_NUMBER_OF_BYTES_READ) AS sum_num_bytes_read, SUM(SUM_NUMBER_OF_BYTES_WRITE) AS sum_num_bytes_write -FROM performance_schema.FILE_SUMMARY_BY_INSTANCE +FROM performance_schema.file_summary_by_instance WHERE FILE_NAME LIKE CONCAT('%', @@tmpdir, '%') ORDER BY NULL; --enable_result_log @@ -144,7 +144,7 @@ WHERE FILE_NAME LIKE CONCAT('%', @@tmpdir, '%') ORDER BY NULL; # --disable_result_log SELECT EVENT_NAME, COUNT_STAR, AVG_TIMER_WAIT, SUM_TIMER_WAIT -FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME +FROM performance_schema.events_waits_summary_global_by_event_name WHERE COUNT_STAR > 0 ORDER BY SUM_TIMER_WAIT DESC LIMIT 10; @@ -157,8 +157,8 @@ LIMIT 10; ## --disable_result_log ## SELECT i.user, SUM(TIMER_WAIT) SUM_WAIT ## # ((TIME_TO_SEC(TIMEDIFF(NOW(), i.startup_time)) * 1000) / SUM(TIMER_WAIT)) * 100 WAIT_PERCENTAGE -## FROM performance_schema.EVENTS_WAITS_HISTORY_LONG h -## INNER JOIN performance_schema.THREADS p USING (THREAD_ID) +## FROM performance_schema.events_waits_history_long h +## INNER JOIN performance_schema.threads p USING (THREAD_ID) ## LEFT JOIN information_schema.PROCESSLIST i USING (ID) ## GROUP BY i.user ## ORDER BY SUM_WAIT DESC @@ -170,8 +170,8 @@ LIMIT 10; # --disable_result_log SELECT h.EVENT_NAME, SUM(h.TIMER_WAIT) TOTAL_WAIT -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG h -INNER JOIN performance_schema.THREADS p USING (THREAD_ID) +FROM performance_schema.events_waits_history_long h +INNER JOIN performance_schema.threads p USING (THREAD_ID) WHERE p.PROCESSLIST_ID = 1 GROUP BY h.EVENT_NAME HAVING TOTAL_WAIT > 0; @@ -183,8 +183,8 @@ HAVING TOTAL_WAIT > 0; ## --disable_result_log ## SELECT i.user, h.operation, SUM(NUMBER_OF_BYTES) bytes -## FROM performance_schema.EVENTS_WAITS_HISTORY_LONG h -## INNER JOIN performance_schema.THREADS p USING (THREAD_ID) +## FROM performance_schema.events_waits_history_long h +## INNER JOIN performance_schema.threads p USING (THREAD_ID) ## LEFT JOIN information_schema.PROCESSLIST i USING (ID) ## GROUP BY i.user, h.operation ## HAVING BYTES > 0 diff --git a/mysql-test/suite/perfschema/t/func_mutex.test b/mysql-test/suite/perfschema/t/func_mutex.test index 98cb905c67c..31d81e4b004 100644 --- a/mysql-test/suite/perfschema/t/func_mutex.test +++ b/mysql-test/suite/perfschema/t/func_mutex.test @@ -22,9 +22,9 @@ --source include/not_embedded.inc --source include/have_perfschema.inc -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO', timed = 'YES'; +UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' +UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/synch/mutex/%' OR name LIKE 'wait/synch/rwlock/%'; @@ -46,41 +46,41 @@ INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8); # FM2: Count for mutex should not increase with instrumentation disabled # -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; SELECT * FROM t1 WHERE id = 1; SET @before_count = (SELECT SUM(TIMER_WAIT) - FROM performance_schema.EVENTS_WAITS_HISTORY_LONG + FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open')); SELECT * FROM t1; SET @after_count = (SELECT SUM(TIMER_WAIT) - FROM performance_schema.EVENTS_WAITS_HISTORY_LONG + FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open')); SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_timed; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO' +UPDATE performance_schema.setup_instruments SET enabled = 'NO' WHERE NAME = 'wait/synch/mutex/sql/LOCK_open'; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; SELECT * FROM t1 WHERE id = 1; SET @before_count = (SELECT SUM(TIMER_WAIT) - FROM performance_schema.EVENTS_WAITS_HISTORY_LONG + FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open')); SELECT * FROM t1; SET @after_count = (SELECT SUM(TIMER_WAIT) - FROM performance_schema.EVENTS_WAITS_HISTORY_LONG + FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open')); SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_timed; @@ -89,41 +89,41 @@ SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success # Repeat for RW-lock # -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; SELECT * FROM t1 WHERE id = 1; SET @before_count = (SELECT SUM(TIMER_WAIT) - FROM performance_schema.EVENTS_WAITS_HISTORY_LONG + FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); SELECT * FROM t1; SET @after_count = (SELECT SUM(TIMER_WAIT) - FROM performance_schema.EVENTS_WAITS_HISTORY_LONG + FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_rw_timed; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO' +UPDATE performance_schema.setup_instruments SET enabled = 'NO' WHERE NAME = 'wait/synch/rwlock/sql/LOCK_grant'; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; SELECT * FROM t1 WHERE id = 1; SET @before_count = (SELECT SUM(TIMER_WAIT) - FROM performance_schema.EVENTS_WAITS_HISTORY_LONG + FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); SELECT * FROM t1; SET @after_count = (SELECT SUM(TIMER_WAIT) - FROM performance_schema.EVENTS_WAITS_HISTORY_LONG + FROM performance_schema.events_waits_history_long WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_rw_timed; diff --git a/mysql-test/suite/perfschema/t/global_read_lock.test b/mysql-test/suite/perfschema/t/global_read_lock.test index b953ea32ce0..711e72ede76 100644 --- a/mysql-test/suite/perfschema/t/global_read_lock.test +++ b/mysql-test/suite/perfschema/t/global_read_lock.test @@ -15,7 +15,7 @@ # Tests for PERFORMANCE_SCHEMA # -# Test the effect of a flush tables with read lock on SETUP_ tables. +# Test the effect of a flush tables with read lock on setup_ tables. --source include/not_embedded.inc --source include/have_perfschema.inc @@ -28,15 +28,15 @@ flush privileges; --echo connect (con1, localhost, pfsuser, , test); connect (con1, localhost, pfsuser, , test); -lock tables performance_schema.SETUP_INSTRUMENTS read; +lock tables performance_schema.setup_instruments read; --disable_result_log -select * from performance_schema.SETUP_INSTRUMENTS; +select * from performance_schema.setup_instruments; --enable_result_log unlock tables; -lock tables performance_schema.SETUP_INSTRUMENTS write; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +lock tables performance_schema.setup_instruments write; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES'; unlock tables; --echo connection default; @@ -47,20 +47,20 @@ flush tables with read lock; --echo connection con1; connection con1; -lock tables performance_schema.SETUP_INSTRUMENTS read; +lock tables performance_schema.setup_instruments read; --disable_result_log -select * from performance_schema.SETUP_INSTRUMENTS; +select * from performance_schema.setup_instruments; --enable_result_log unlock tables; # This will block --send -lock tables performance_schema.SETUP_INSTRUMENTS write; +lock tables performance_schema.setup_instruments write; --echo connection default; connection default; -let $wait_condition= select 1 from performance_schema.EVENTS_WAITS_CURRENT where event_name like "wait/synch/cond/sql/COND_global_read_lock"; +let $wait_condition= select 1 from performance_schema.events_waits_current where event_name like "wait/synch/cond/sql/COND_global_read_lock"; --source include/wait_condition.inc @@ -68,7 +68,7 @@ let $wait_condition= select 1 from performance_schema.EVENTS_WAITS_CURRENT where select event_name, left(source, locate(":", source)) as short_source, timer_end, timer_wait, operation - from performance_schema.EVENTS_WAITS_CURRENT + from performance_schema.events_waits_current where event_name like "wait/synch/cond/sql/COND_global_read_lock"; unlock tables; @@ -76,8 +76,8 @@ unlock tables; connection con1; --reap -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES'; unlock tables; disconnect con1; diff --git a/mysql-test/suite/perfschema/t/information_schema.test b/mysql-test/suite/perfschema/t/information_schema.test index 3d2822a1db3..36ba1912df3 100644 --- a/mysql-test/suite/perfschema/t/information_schema.test +++ b/mysql-test/suite/perfschema/t/information_schema.test @@ -22,46 +22,46 @@ # Note that TABLE_NAME is in uppercase is some platforms, # and in lowercase in others. -# Using upper(TABLE_NAME) to have consistent results. +# Using lower(TABLE_NAME) to have consistent results. -select TABLE_SCHEMA, upper(TABLE_NAME), TABLE_CATALOG +select TABLE_SCHEMA, lower(TABLE_NAME), TABLE_CATALOG from information_schema.tables where TABLE_SCHEMA='performance_schema'; -select upper(TABLE_NAME), TABLE_TYPE, ENGINE +select lower(TABLE_NAME), TABLE_TYPE, ENGINE from information_schema.tables where TABLE_SCHEMA='performance_schema'; -select upper(TABLE_NAME), VERSION, ROW_FORMAT +select lower(TABLE_NAME), VERSION, ROW_FORMAT from information_schema.tables where TABLE_SCHEMA='performance_schema'; -select upper(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH +select lower(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH from information_schema.tables where TABLE_SCHEMA='performance_schema'; -select upper(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH +select lower(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH from information_schema.tables where TABLE_SCHEMA='performance_schema'; -select upper(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT +select lower(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT from information_schema.tables where TABLE_SCHEMA='performance_schema'; -select upper(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME +select lower(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME from information_schema.tables where TABLE_SCHEMA='performance_schema'; -select upper(TABLE_NAME), TABLE_COLLATION, CHECKSUM +select lower(TABLE_NAME), TABLE_COLLATION, CHECKSUM from information_schema.tables where TABLE_SCHEMA='performance_schema'; # TABLESPACE_NAME does not exist in 5.4 -# select upper(TABLE_NAME), CREATE_OPTIONS, TABLESPACE_NAME +# select lower(TABLE_NAME), CREATE_OPTIONS, TABLESPACE_NAME # from information_schema.tables # where TABLE_SCHEMA='performance_schema'; -select upper(TABLE_NAME), TABLE_COMMENT +select lower(TABLE_NAME), TABLE_COMMENT from information_schema.tables where TABLE_SCHEMA='performance_schema'; diff --git a/mysql-test/suite/perfschema/t/misc.test b/mysql-test/suite/perfschema/t/misc.test index d497c205d50..72e891ca805 100644 --- a/mysql-test/suite/perfschema/t/misc.test +++ b/mysql-test/suite/perfschema/t/misc.test @@ -25,11 +25,11 @@ # --disable_result_log -SELECT EVENT_ID FROM performance_schema.EVENTS_WAITS_CURRENT +SELECT EVENT_ID FROM performance_schema.events_waits_current WHERE THREAD_ID IN - (SELECT THREAD_ID FROM performance_schema.THREADS) + (SELECT THREAD_ID FROM performance_schema.threads) AND EVENT_NAME IN - (SELECT NAME FROM performance_schema.SETUP_INSTRUMENTS + (SELECT NAME FROM performance_schema.setup_instruments WHERE NAME LIKE "wait/synch/%") LIMIT 1; --enable_result_log @@ -46,7 +46,7 @@ create table test.t1(a int) engine=performance_schema; # --error ER_WRONG_PERFSCHEMA_USAGE -create table test.t1 like performance_schema.EVENTS_WAITS_CURRENT; +create table test.t1 like performance_schema.events_waits_current; # # Bug#44898 PerformanceSchema: can create a table in db performance_schema, cannot insert @@ -73,7 +73,7 @@ select * from test.ghost; drop table test.ghost; # Shoud return nothing -select * from performance_schema.FILE_INSTANCES +select * from performance_schema.file_instances where file_name like "%ghost%"; # diff --git a/mysql-test/suite/perfschema/t/myisam_file_io.test b/mysql-test/suite/perfschema/t/myisam_file_io.test index 0861e8f4b74..c2502b5895a 100644 --- a/mysql-test/suite/perfschema/t/myisam_file_io.test +++ b/mysql-test/suite/perfschema/t/myisam_file_io.test @@ -20,14 +20,14 @@ # Setup -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/file/myisam/%"; -update performance_schema.SETUP_CONSUMERS +update performance_schema.setup_consumers set enabled='YES'; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_history_long; # Reset lost counters to a known state flush status; @@ -51,7 +51,7 @@ select event_name, left(source, locate(":", source)) as short_source, operation, number_of_bytes, substring(object_name, locate("no_index_tab", object_name)) as short_name - from performance_schema.EVENTS_WAITS_HISTORY_LONG + from performance_schema.events_waits_history_long where operation not like "tell" order by thread_id, event_id; @@ -60,7 +60,7 @@ show status like 'performance_schema_%'; # Cleanup -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; drop table test.no_index_tab; diff --git a/mysql-test/suite/perfschema/t/no_threads.test b/mysql-test/suite/perfschema/t/no_threads.test index 9254535bf1f..f98aa8abdb7 100644 --- a/mysql-test/suite/perfschema/t/no_threads.test +++ b/mysql-test/suite/perfschema/t/no_threads.test @@ -21,18 +21,18 @@ # Setup : in this main thread -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_consumers set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/synch/mutex/mysys/THR_LOCK_myisam"; --disable_warnings drop table if exists test.t1; --enable_warnings -truncate table performance_schema.EVENTS_WAITS_CURRENT; -truncate table performance_schema.EVENTS_WAITS_HISTORY; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_current; +truncate table performance_schema.events_waits_history; +truncate table performance_schema.events_waits_history_long; show variables like "thread_handling"; @@ -45,23 +45,23 @@ show variables like "performance_schema_max_thread%"; # Verification : in this main thread -select count(*) from performance_schema.THREADS +select count(*) from performance_schema.threads where name like "thread/sql/main"; -select count(*) from performance_schema.THREADS +select count(*) from performance_schema.threads where name like "thread/sql/OneConnection"; select event_name, operation, left(source, locate(":", source)) as short_source - from performance_schema.EVENTS_WAITS_CURRENT; + from performance_schema.events_waits_current; select event_name, operation, left(source, locate(":", source)) as short_source - from performance_schema.EVENTS_WAITS_HISTORY; + from performance_schema.events_waits_history; select event_name, operation, left(source, locate(":", source)) as short_source - from performance_schema.EVENTS_WAITS_HISTORY_LONG; + from performance_schema.events_waits_history_long; # Cleanup diff --git a/mysql-test/suite/perfschema/t/one_thread_per_con.test b/mysql-test/suite/perfschema/t/one_thread_per_con.test index 7d0daffe228..5393152f7d2 100644 --- a/mysql-test/suite/perfschema/t/one_thread_per_con.test +++ b/mysql-test/suite/perfschema/t/one_thread_per_con.test @@ -27,7 +27,7 @@ # The point is not to test myisam, but to test that each # connection is properly instrumented, with one-thread-per-connection -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_instruments set enabled='YES' where name like "wait/synch/mutex/mysys/THR_LOCK_myisam"; --disable_warnings @@ -36,7 +36,7 @@ drop table if exists test.t2; drop table if exists test.t3; --enable_warnings -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_history_long; show variables like "thread_handling"; diff --git a/mysql-test/suite/perfschema/t/privilege.test b/mysql-test/suite/perfschema/t/privilege.test index 2d682de2870..277ba9bf3b8 100644 --- a/mysql-test/suite/perfschema/t/privilege.test +++ b/mysql-test/suite/perfschema/t/privilege.test @@ -76,136 +76,128 @@ grant DELETE on performance_schema.* to 'pfs_user_2'@localhost; grant LOCK TABLES on performance_schema.* to 'pfs_user_2'@localhost; # Test denied privileges on specific performance_schema tables. -# SETUP_INSTRUMENT : example of PFS_updatable_acl -# EVENTS_WAITS_CURRENT : example of PFS_truncatable_acl -# FILE_INSTANCES : example of PFS_readonly_acl +# setup_instrument : example of PFS_updatable_acl +# events_waits_current : example of PFS_truncatable_acl +# file_instances : example of PFS_readonly_acl --error ER_DBACCESS_DENIED_ERROR -grant ALL on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost +grant ALL on performance_schema.setup_instruments to 'pfs_user_3'@localhost with GRANT OPTION; # will be ER_DBACCESS_DENIED_ERROR once .FRM are removed -grant CREATE on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant CREATE on performance_schema.setup_instruments to 'pfs_user_3'@localhost; # will be ER_DBACCESS_DENIED_ERROR once .FRM are removed -grant DROP on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant DROP on performance_schema.setup_instruments to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant REFERENCES on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant REFERENCES on performance_schema.setup_instruments to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant INDEX on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant INDEX on performance_schema.setup_instruments to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant ALTER on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant ALTER on performance_schema.setup_instruments to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant CREATE VIEW on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant CREATE VIEW on performance_schema.setup_instruments to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant SHOW VIEW on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant SHOW VIEW on performance_schema.setup_instruments to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant TRIGGER on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant TRIGGER on performance_schema.setup_instruments to 'pfs_user_3'@localhost; ---replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS' --error ER_TABLEACCESS_DENIED_ERROR -grant INSERT on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant INSERT on performance_schema.setup_instruments to 'pfs_user_3'@localhost; ---replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS' --error ER_TABLEACCESS_DENIED_ERROR -grant DELETE on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; +grant DELETE on performance_schema.setup_instruments to 'pfs_user_3'@localhost; -grant SELECT on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost +grant SELECT on performance_schema.setup_instruments to 'pfs_user_3'@localhost with GRANT OPTION; -grant UPDATE on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost +grant UPDATE on performance_schema.setup_instruments to 'pfs_user_3'@localhost with GRANT OPTION; --error ER_DBACCESS_DENIED_ERROR -grant ALL on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost +grant ALL on performance_schema.events_waits_current to 'pfs_user_3'@localhost with GRANT OPTION; # will be ER_DBACCESS_DENIED_ERROR once .FRM are removed -grant CREATE on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant CREATE on performance_schema.events_waits_current to 'pfs_user_3'@localhost; # will be ER_DBACCESS_DENIED_ERROR once .FRM are removed -grant DROP on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant DROP on performance_schema.events_waits_current to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant REFERENCES on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant REFERENCES on performance_schema.events_waits_current to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant INDEX on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant INDEX on performance_schema.events_waits_current to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant ALTER on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant ALTER on performance_schema.events_waits_current to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant CREATE VIEW on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant CREATE VIEW on performance_schema.events_waits_current to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant SHOW VIEW on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant SHOW VIEW on performance_schema.events_waits_current to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant TRIGGER on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant TRIGGER on performance_schema.events_waits_current to 'pfs_user_3'@localhost; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -grant INSERT on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant INSERT on performance_schema.events_waits_current to 'pfs_user_3'@localhost; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -grant UPDATE on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant UPDATE on performance_schema.events_waits_current to 'pfs_user_3'@localhost; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -grant DELETE on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; +grant DELETE on performance_schema.events_waits_current to 'pfs_user_3'@localhost; -grant SELECT on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost +grant SELECT on performance_schema.events_waits_current to 'pfs_user_3'@localhost with GRANT OPTION; --error ER_DBACCESS_DENIED_ERROR -grant ALL on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost +grant ALL on performance_schema.file_instances to 'pfs_user_3'@localhost with GRANT OPTION; # will be ER_DBACCESS_DENIED_ERROR once .FRM are removed -grant CREATE on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant CREATE on performance_schema.file_instances to 'pfs_user_3'@localhost; # will be ER_DBACCESS_DENIED_ERROR once .FRM are removed -grant DROP on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant DROP on performance_schema.file_instances to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant REFERENCES on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant REFERENCES on performance_schema.file_instances to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant INDEX on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant INDEX on performance_schema.file_instances to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant ALTER on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant ALTER on performance_schema.file_instances to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant CREATE VIEW on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant CREATE VIEW on performance_schema.file_instances to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant SHOW VIEW on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant SHOW VIEW on performance_schema.file_instances to 'pfs_user_3'@localhost; --error ER_DBACCESS_DENIED_ERROR -grant TRIGGER on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant TRIGGER on performance_schema.file_instances to 'pfs_user_3'@localhost; ---replace_result '\'file_instances' '\'FILE_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -grant INSERT on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant INSERT on performance_schema.file_instances to 'pfs_user_3'@localhost; ---replace_result '\'file_instances' '\'FILE_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -grant UPDATE on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant UPDATE on performance_schema.file_instances to 'pfs_user_3'@localhost; ---replace_result '\'file_instances' '\'FILE_INSTANCES' --error ER_TABLEACCESS_DENIED_ERROR -grant DELETE on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; +grant DELETE on performance_schema.file_instances to 'pfs_user_3'@localhost; -grant SELECT on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost +grant SELECT on performance_schema.file_instances to 'pfs_user_3'@localhost with GRANT OPTION; # See bug#45354 LOCK TABLES is not a TABLE privilege @@ -258,25 +250,20 @@ CREATE user pfs_user_4; --connection pfs_user_4 --echo # Select as pfs_user_4 should fail without grant ---replace_result '\'events_waits_history' '\'EVENTS_WAITS_HISTORY' --error ER_TABLEACCESS_DENIED_ERROR -SELECT event_id FROM performance_schema.EVENTS_WAITS_HISTORY; +SELECT event_id FROM performance_schema.events_waits_history; ---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG' --error ER_TABLEACCESS_DENIED_ERROR -SELECT event_id FROM performance_schema.EVENTS_WAITS_HISTORY_LONG; +SELECT event_id FROM performance_schema.events_waits_history_long; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -SELECT event_id FROM performance_schema.EVENTS_WAITS_CURRENT; +SELECT event_id FROM performance_schema.events_waits_current; ---replace_result '\'events_waits_summary_by_instance' '\'EVENTS_WAITS_SUMMARY_BY_INSTANCE' --error ER_TABLEACCESS_DENIED_ERROR -SELECT event_name FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; +SELECT event_name FROM performance_schema.events_waits_summary_by_instance; ---replace_result '\'file_summary_by_instance' '\'FILE_SUMMARY_BY_INSTANCE' --error ER_TABLEACCESS_DENIED_ERROR -SELECT event_name FROM performance_schema.FILE_SUMMARY_BY_INSTANCE; +SELECT event_name FROM performance_schema.file_summary_by_instance; --echo # --echo # WL#4818, NFS3: Normal user does not have access to change what is @@ -287,35 +274,28 @@ SELECT event_name FROM performance_schema.FILE_SUMMARY_BY_INSTANCE; --echo # User pfs_user_4 should not be allowed to tweak instrumentation without --echo # explicit grant ---replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS' --error ER_TABLEACCESS_DENIED_ERROR -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO', timed = 'YES'; +UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES'; ---replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS' --error ER_TABLEACCESS_DENIED_ERROR -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' +UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/synch/mutex/%' OR name LIKE 'wait/synch/rwlock/%'; ---replace_result '\'setup_consumers' '\'SETUP_CONSUMERS' --error ER_TABLEACCESS_DENIED_ERROR -UPDATE performance_schema.SETUP_CONSUMERS SET enabled = 'YES'; +UPDATE performance_schema.setup_consumers SET enabled = 'YES'; ---replace_result '\'setup_timers' '\'SETUP_TIMERS' --error ER_TABLEACCESS_DENIED_ERROR -UPDATE performance_schema.SETUP_TIMERS SET timer_name = 'TICK'; +UPDATE performance_schema.setup_timers SET timer_name = 'TICK'; ---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG' --error ER_TABLEACCESS_DENIED_ERROR -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; +TRUNCATE TABLE performance_schema.events_waits_history_long; ---replace_result '\'events_waits_history' '\'EVENTS_WAITS_HISTORY' --error ER_TABLEACCESS_DENIED_ERROR -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; +TRUNCATE TABLE performance_schema.events_waits_history; ---replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' --error ER_TABLEACCESS_DENIED_ERROR -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +TRUNCATE TABLE performance_schema.events_waits_current; --echo # --echo # WL#4814, NFS1: Can use grants to give normal user access @@ -325,29 +305,29 @@ TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; --connection default --echo # Grant access to change tables with the root account -GRANT UPDATE ON performance_schema.SETUP_CONSUMERS TO pfs_user_4; -GRANT UPDATE ON performance_schema.SETUP_TIMERS TO pfs_user_4; -GRANT UPDATE, SELECT ON performance_schema.SETUP_INSTRUMENTS TO pfs_user_4; -GRANT DROP ON performance_schema.EVENTS_WAITS_CURRENT TO pfs_user_4; -GRANT DROP ON performance_schema.EVENTS_WAITS_HISTORY TO pfs_user_4; -GRANT DROP ON performance_schema.EVENTS_WAITS_HISTORY_LONG TO pfs_user_4; +GRANT UPDATE ON performance_schema.setup_consumers TO pfs_user_4; +GRANT UPDATE ON performance_schema.setup_timers TO pfs_user_4; +GRANT UPDATE, SELECT ON performance_schema.setup_instruments TO pfs_user_4; +GRANT DROP ON performance_schema.events_waits_current TO pfs_user_4; +GRANT DROP ON performance_schema.events_waits_history TO pfs_user_4; +GRANT DROP ON performance_schema.events_waits_history_long TO pfs_user_4; --connection pfs_user_4 --echo # User pfs_user_4 should now be allowed to tweak instrumentation -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO', timed = 'YES'; +UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES'; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' +UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/synch/mutex/%' OR name LIKE 'wait/synch/rwlock/%'; -UPDATE performance_schema.SETUP_CONSUMERS SET enabled = 'YES'; +UPDATE performance_schema.setup_consumers SET enabled = 'YES'; -UPDATE performance_schema.SETUP_TIMERS SET timer_name = 'TICK'; +UPDATE performance_schema.setup_timers SET timer_name = 'TICK'; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; -TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; +TRUNCATE TABLE performance_schema.events_waits_history_long; +TRUNCATE TABLE performance_schema.events_waits_history; +TRUNCATE TABLE performance_schema.events_waits_current; --echo # Clean up --disconnect pfs_user_4 @@ -356,7 +336,7 @@ TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; REVOKE ALL PRIVILEGES, GRANT OPTION FROM pfs_user_4; DROP USER pfs_user_4; flush privileges; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES'; -UPDATE performance_schema.SETUP_CONSUMERS SET enabled = 'YES'; -UPDATE performance_schema.SETUP_TIMERS SET timer_name = 'CYCLE'; +UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; +UPDATE performance_schema.setup_consumers SET enabled = 'YES'; +UPDATE performance_schema.setup_timers SET timer_name = 'CYCLE'; diff --git a/mysql-test/suite/perfschema/t/query_cache.test b/mysql-test/suite/perfschema/t/query_cache.test index a48704dc9d6..6e322434ae0 100644 --- a/mysql-test/suite/perfschema/t/query_cache.test +++ b/mysql-test/suite/perfschema/t/query_cache.test @@ -47,17 +47,17 @@ show status like "Qcache_queries_in_cache"; show status like "Qcache_inserts"; show status like "Qcache_hits"; -select spins from performance_schema.EVENTS_WAITS_CURRENT order by event_name limit 1; +select spins from performance_schema.events_waits_current order by event_name limit 1; -select name from performance_schema.SETUP_INSTRUMENTS order by name limit 1; +select name from performance_schema.setup_instruments order by name limit 1; show status like "Qcache_queries_in_cache"; show status like "Qcache_inserts"; show status like "Qcache_hits"; -select spins from performance_schema.EVENTS_WAITS_CURRENT order by event_name limit 1; +select spins from performance_schema.events_waits_current order by event_name limit 1; -select name from performance_schema.SETUP_INSTRUMENTS order by name limit 1; +select name from performance_schema.setup_instruments order by name limit 1; show status like "Qcache_queries_in_cache"; show status like "Qcache_inserts"; diff --git a/mysql-test/suite/perfschema/t/read_only.test b/mysql-test/suite/perfschema/t/read_only.test index 73150207f66..98683e36327 100644 --- a/mysql-test/suite/perfschema/t/read_only.test +++ b/mysql-test/suite/perfschema/t/read_only.test @@ -16,8 +16,8 @@ # Tests for PERFORMANCE_SCHEMA # # Check that -# - a regular user can not update SETUP_ tables under --read-only -# - a user with SUPER privileges cam +# - a regular user can not update setup_ tables under --read-only +# - a user with SUPER privileges can --source include/not_embedded.inc --source include/have_perfschema.inc @@ -43,9 +43,9 @@ connection con1; select @@global.read_only; show grants; --disable_result_log -select * from performance_schema.SETUP_INSTRUMENTS; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +select * from performance_schema.setup_instruments; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES'; --enable_result_log --echo connection default; @@ -59,11 +59,11 @@ connection con1; select @@global.read_only; show grants; --disable_result_log -select * from performance_schema.SETUP_INSTRUMENTS; +select * from performance_schema.setup_instruments; --error ER_OPTION_PREVENTS_STATEMENT -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; --error ER_OPTION_PREVENTS_STATEMENT -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; --enable_result_log --echo connection default; @@ -79,9 +79,9 @@ connect (con1, localhost, pfsuser, , test); select @@global.read_only; show grants; --disable_result_log -select * from performance_schema.SETUP_INSTRUMENTS; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +select * from performance_schema.setup_instruments; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES'; --enable_result_log disconnect con1; diff --git a/mysql-test/suite/perfschema/t/schema.test b/mysql-test/suite/perfschema/t/schema.test index 727c4f5a755..32ee4a26676 100644 --- a/mysql-test/suite/perfschema/t/schema.test +++ b/mysql-test/suite/perfschema/t/schema.test @@ -25,21 +25,21 @@ use performance_schema; show tables; -show create table COND_INSTANCES; -show create table EVENTS_WAITS_CURRENT; -show create table EVENTS_WAITS_HISTORY; -show create table EVENTS_WAITS_HISTORY_LONG; -show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE; -show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; -show create table EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; -show create table FILE_INSTANCES; -show create table FILE_SUMMARY_BY_EVENT_NAME; -show create table FILE_SUMMARY_BY_INSTANCE; -show create table MUTEX_INSTANCES; -show create table PERFORMANCE_TIMERS; -show create table RWLOCK_INSTANCES; -show create table SETUP_CONSUMERS; -show create table SETUP_INSTRUMENTS; -show create table SETUP_TIMERS; -show create table THREADS; +show create table cond_instances; +show create table events_waits_current; +show create table events_waits_history; +show create table events_waits_history_long; +show create table events_waits_summary_by_instance; +show create table events_waits_summary_by_thread_by_event_name; +show create table events_waits_summary_global_by_event_name; +show create table file_instances; +show create table file_summary_by_event_name; +show create table file_summary_by_instance; +show create table mutex_instances; +show create table performance_timers; +show create table rwlock_instances; +show create table setup_consumers; +show create table setup_instruments; +show create table setup_timers; +show create table threads; diff --git a/mysql-test/suite/perfschema/t/selects.test b/mysql-test/suite/perfschema/t/selects.test index d0249fe654c..e8fd0827c53 100644 --- a/mysql-test/suite/perfschema/t/selects.test +++ b/mysql-test/suite/perfschema/t/selects.test @@ -22,7 +22,7 @@ # Make some data that we can work on: -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES'; +UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; --disable_warnings DROP TABLE IF EXISTS t1; @@ -35,7 +35,7 @@ INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8); --replace_column 2 [NUM_BYTES] SELECT OPERATION, SUM(NUMBER_OF_BYTES) AS TOTAL -FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +FROM performance_schema.events_waits_history_long GROUP BY OPERATION HAVING TOTAL IS NOT NULL ORDER BY OPERATION @@ -43,11 +43,11 @@ LIMIT 1; # Sub SELECT --replace_column 1 [EVENT_ID] -SELECT EVENT_ID FROM performance_schema.EVENTS_WAITS_CURRENT +SELECT EVENT_ID FROM performance_schema.events_waits_current WHERE THREAD_ID IN - (SELECT THREAD_ID FROM performance_schema.THREADS) + (SELECT THREAD_ID FROM performance_schema.threads) AND EVENT_NAME IN - (SELECT NAME FROM performance_schema.SETUP_INSTRUMENTS + (SELECT NAME FROM performance_schema.setup_instruments WHERE NAME LIKE "wait/synch/%") LIMIT 1; @@ -55,9 +55,9 @@ LIMIT 1; --replace_column 1 [EVENT_ID] SELECT DISTINCT EVENT_ID -FROM performance_schema.EVENTS_WAITS_CURRENT -JOIN performance_schema.EVENTS_WAITS_HISTORY USING (EVENT_ID) -JOIN performance_schema.EVENTS_WAITS_HISTORY_LONG USING (EVENT_ID) +FROM performance_schema.events_waits_current +JOIN performance_schema.events_waits_history USING (EVENT_ID) +JOIN performance_schema.events_waits_history_long USING (EVENT_ID) ORDER BY EVENT_ID LIMIT 1; @@ -65,21 +65,21 @@ LIMIT 1; --replace_column 1 [THREAD_ID] 2 [EVENT_ID] 3 [EVENT_NAME] 4 [TIMER_WAIT] SELECT t1.THREAD_ID, t2.EVENT_ID, t3.EVENT_NAME, t4.TIMER_WAIT -FROM performance_schema.EVENTS_WAITS_HISTORY t1 -JOIN performance_schema.EVENTS_WAITS_HISTORY t2 USING (EVENT_ID) -JOIN performance_schema.EVENTS_WAITS_HISTORY t3 ON (t2.THREAD_ID = t3.THREAD_ID) -JOIN performance_schema.EVENTS_WAITS_HISTORY t4 ON (t3.EVENT_NAME = t4.EVENT_NAME) +FROM performance_schema.events_waits_history t1 +JOIN performance_schema.events_waits_history t2 USING (EVENT_ID) +JOIN performance_schema.events_waits_history t3 ON (t2.THREAD_ID = t3.THREAD_ID) +JOIN performance_schema.events_waits_history t4 ON (t3.EVENT_NAME = t4.EVENT_NAME) ORDER BY t1.EVENT_ID, t2.EVENT_ID LIMIT 5; # UNION --replace_column 1 [THREAD_ID] 2 [EVENT_ID] SELECT THREAD_ID, EVENT_ID FROM ( -SELECT THREAD_ID, EVENT_ID FROM performance_schema.EVENTS_WAITS_CURRENT +SELECT THREAD_ID, EVENT_ID FROM performance_schema.events_waits_current UNION -SELECT THREAD_ID, EVENT_ID FROM performance_schema.EVENTS_WAITS_HISTORY +SELECT THREAD_ID, EVENT_ID FROM performance_schema.events_waits_history UNION -SELECT THREAD_ID, EVENT_ID FROM performance_schema.EVENTS_WAITS_HISTORY_LONG +SELECT THREAD_ID, EVENT_ID FROM performance_schema.events_waits_history_long ) t1 ORDER BY THREAD_ID, EVENT_ID LIMIT 5; @@ -93,14 +93,14 @@ DROP TABLE IF EXISTS t_event; DROP EVENT IF EXISTS t_ps_event; --enable_warnings CREATE TABLE t_event AS -SELECT EVENT_ID FROM performance_schema.EVENTS_WAITS_CURRENT +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) + FROM performance_schema.events_waits_current + JOIN performance_schema.events_waits_history USING (EVENT_ID) ORDER BY EVENT_ID LIMIT 1; @@ -116,7 +116,7 @@ delimiter |; CREATE TRIGGER t_ps_trigger BEFORE INSERT ON t1 FOR EACH ROW BEGIN SET NEW.c = (SELECT MAX(EVENT_ID) - FROM performance_schema.EVENTS_WAITS_CURRENT); + FROM performance_schema.events_waits_current); END; | @@ -138,7 +138,7 @@ delimiter |; CREATE PROCEDURE t_ps_proc(IN conid INT, OUT pid INT) BEGIN - SELECT thread_id FROM performance_schema.THREADS + SELECT thread_id FROM performance_schema.threads WHERE PROCESSLIST_ID = conid INTO pid; END; @@ -157,7 +157,7 @@ delimiter |; CREATE FUNCTION t_ps_func(conid INT) RETURNS int BEGIN - return (SELECT thread_id FROM performance_schema.THREADS + return (SELECT thread_id FROM performance_schema.threads WHERE PROCESSLIST_ID = conid); END; diff --git a/mysql-test/suite/perfschema/t/server_init.test b/mysql-test/suite/perfschema/t/server_init.test index cc461374a79..93663118772 100644 --- a/mysql-test/suite/perfschema/t/server_init.test +++ b/mysql-test/suite/perfschema/t/server_init.test @@ -28,185 +28,185 @@ use performance_schema; # Verify that these global mutexes have been properly initilized in mysys -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_threads"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_malloc"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_open"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_isam"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_myisam"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_heap"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_net"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_charset"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_time"; # There are no global rwlock in mysys # Verify that these global conditions have been properly initilized in mysys -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/mysys/THR_COND_threads"; # Verify that these global mutexes have been properly initilized in sql -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_open"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_thread_count"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_status"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_error_log"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_delayed_insert"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_uuid_generator"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_delayed_status"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_delayed_create"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_crypt"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_slave_list"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_active_mi"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_manager"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_global_read_lock"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_global_system_variables"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_user_conn"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_prepared_stmt_count"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_connection_count"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_server_started"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_rpl_status"; # LOG_INFO object are created on demand, and are not global. -# select count(name) from MUTEX_INSTANCES +# select count(name) from mutex_instances # where name like "wait/synch/mutex/sql/LOG_INFO::lock"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/Query_cache::structure_guard_mutex"; # The event scheduler may be disabled -# select count(name) from MUTEX_INSTANCES +# select count(name) from mutex_instances # where name like "wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_event_metadata"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_event_queue"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_user_locks"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/Cversion_lock"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_audit_mask"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_xid_cache"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_plugin"; # Not a global variable, may be destroyed already. -# select count(name) from MUTEX_INSTANCES +# select count(name) from mutex_instances # where name like "wait/synch/mutex/sql/LOCK_gdl"; -select count(name) from MUTEX_INSTANCES +select count(name) from mutex_instances where name like "wait/synch/mutex/sql/tz_LOCK"; # Verify that these global rwlocks have been properly initilized in sql -select count(name) from RWLOCK_INSTANCES +select count(name) from rwlock_instances where name like "wait/synch/rwlock/sql/LOCK_grant"; -select count(name) from RWLOCK_INSTANCES +select count(name) from rwlock_instances where name like "wait/synch/rwlock/sql/LOCK_sys_init_connect"; -select count(name) from RWLOCK_INSTANCES +select count(name) from rwlock_instances where name like "wait/synch/rwlock/sql/LOCK_sys_init_slave"; -select count(name) from RWLOCK_INSTANCES +select count(name) from rwlock_instances where name like "wait/synch/rwlock/sql/LOCK_system_variables_hash"; # Verify that these global conditions have been properly initilized in sql -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_server_started"; -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_refresh"; -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_thread_count"; -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_manager"; -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_global_read_lock"; -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_thread_cache"; -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_flush_thread_cache"; -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_rpl_status"; -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/Query_cache::COND_cache_status_changed"; # The event scheduler may be disabled -# select count(name) from COND_INSTANCES +# select count(name) from cond_instances # where name like "wait/synch/cond/sql/Event_scheduler::COND_state"; -select count(name) from COND_INSTANCES +select count(name) from cond_instances where name like "wait/synch/cond/sql/COND_queue_state"; diff --git a/mysql-test/suite/perfschema/t/start_server_no_cond_class.test b/mysql-test/suite/perfschema/t/start_server_no_cond_class.test index 34ff61c358e..da75306c2ca 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_cond_class.test +++ b/mysql-test/suite/perfschema/t/start_server_no_cond_class.test @@ -23,7 +23,7 @@ # Expect no classes show variables like "performance_schema_max_cond_classes"; -select count(*) from performance_schema.SETUP_INSTRUMENTS +select count(*) from performance_schema.setup_instruments where name like "wait/synch/cond/%"; # We lost all the classes @@ -31,7 +31,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_COND_CLASSES_LOST'; # Expect no instances -select count(*) from performance_schema.COND_INSTANCES; +select count(*) from performance_schema.cond_instances; # Expect no instances lost show status like "performance_schema_cond_instances_lost"; diff --git a/mysql-test/suite/perfschema/t/start_server_no_cond_inst.test b/mysql-test/suite/perfschema/t/start_server_no_cond_inst.test index fe2177adb82..eb77d76b70e 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_cond_inst.test +++ b/mysql-test/suite/perfschema/t/start_server_no_cond_inst.test @@ -23,7 +23,7 @@ # Expect classes show variables like "performance_schema_max_cond_classes"; -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS +select count(*) > 0 from performance_schema.setup_instruments where name like "wait/synch/cond/%"; # Expect no class lost @@ -32,7 +32,7 @@ show status like "performance_schema_cond_classes_lost"; # Expect no instances show variables like "performance_schema_max_cond_instances"; -select count(*) from performance_schema.COND_INSTANCES; +select count(*) from performance_schema.cond_instances; # Expect instances lost select variable_value > 0 from information_schema.global_status diff --git a/mysql-test/suite/perfschema/t/start_server_no_file_class.test b/mysql-test/suite/perfschema/t/start_server_no_file_class.test index ca84fbbdcf2..03180dae01e 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_file_class.test +++ b/mysql-test/suite/perfschema/t/start_server_no_file_class.test @@ -23,7 +23,7 @@ # Expect no classes show variables like "performance_schema_max_file_classes"; -select count(*) from performance_schema.SETUP_INSTRUMENTS +select count(*) from performance_schema.setup_instruments where name like "wait/io/file/%"; # We lost all the classes @@ -31,7 +31,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_FILE_CLASSES_LOST'; # Expect no instances -select count(*) from performance_schema.FILE_INSTANCES; +select count(*) from performance_schema.file_instances; # Expect no instances lost show status like "performance_schema_file_instances_lost"; diff --git a/mysql-test/suite/perfschema/t/start_server_no_file_inst.test b/mysql-test/suite/perfschema/t/start_server_no_file_inst.test index dbbba7bbe4a..faa5e97a853 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_file_inst.test +++ b/mysql-test/suite/perfschema/t/start_server_no_file_inst.test @@ -23,7 +23,7 @@ # Expect classes show variables like "performance_schema_max_file_classes"; -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS +select count(*) > 0 from performance_schema.setup_instruments where name like "wait/io/file/%"; # Expect no class lost @@ -32,7 +32,7 @@ show status like "performance_schema_file_classes_lost"; # Expect no instances show variables like "performance_schema_max_file_instances"; -select count(*) from performance_schema.FILE_INSTANCES; +select count(*) from performance_schema.file_instances; # Expect instances lost select variable_value > 0 from information_schema.global_status diff --git a/mysql-test/suite/perfschema/t/start_server_no_mutex_class.test b/mysql-test/suite/perfschema/t/start_server_no_mutex_class.test index 142e150ede6..79bf3d52bc5 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_mutex_class.test +++ b/mysql-test/suite/perfschema/t/start_server_no_mutex_class.test @@ -23,7 +23,7 @@ # Expect no classes show variables like "performance_schema_max_mutex_classes"; -select count(*) from performance_schema.SETUP_INSTRUMENTS +select count(*) from performance_schema.setup_instruments where name like "wait/synch/mutex/%"; # We lost all the classes @@ -31,7 +31,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_MUTEX_CLASSES_LOST'; # Expect no instances -select count(*) from performance_schema.MUTEX_INSTANCES; +select count(*) from performance_schema.mutex_instances; # Expect no instances lost show status like "performance_schema_mutex_instances_lost"; diff --git a/mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test b/mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test index 5a03251d97a..32c0a02b642 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test +++ b/mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test @@ -23,7 +23,7 @@ # Expect classes show variables like "performance_schema_max_mutex_classes"; -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS +select count(*) > 0 from performance_schema.setup_instruments where name like "wait/synch/mutex/%"; # Expect no class lost @@ -32,7 +32,7 @@ show status like "performance_schema_mutex_classes_lost"; # Expect no instances show variables like "performance_schema_max_mutex_instances"; -select count(*) from performance_schema.MUTEX_INSTANCES; +select count(*) from performance_schema.mutex_instances; # Expect instances lost select variable_value > 0 from information_schema.global_status diff --git a/mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test b/mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test index e4dfe121fcf..10780b59fbe 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test +++ b/mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test @@ -23,7 +23,7 @@ # Expect no classes show variables like "performance_schema_max_rwlock_classes"; -select count(*) from performance_schema.SETUP_INSTRUMENTS +select count(*) from performance_schema.setup_instruments where name like "wait/synch/rwlock/%"; # We lost all the classes @@ -31,7 +31,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_RWLOCK_CLASSES_LOST'; # Expect no instances -select count(*) from performance_schema.RWLOCK_INSTANCES; +select count(*) from performance_schema.rwlock_instances; # Expect no instances lost show status like "performance_schema_rwlock_instances_lost"; diff --git a/mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test b/mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test index 1d79d2d3991..2ba2ebcdd4b 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test +++ b/mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test @@ -23,7 +23,7 @@ # Expect classes show variables like "performance_schema_max_rwlock_classes"; -select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS +select count(*) > 0 from performance_schema.setup_instruments where name like "wait/synch/rwlock/%"; # Expect no class lost @@ -32,7 +32,7 @@ show status like "performance_schema_rwlock_classes_lost"; # Expect no instances show variables like "performance_schema_max_rwlock_instances"; -select count(*) from performance_schema.RWLOCK_INSTANCES; +select count(*) from performance_schema.rwlock_instances; # Expect instances lost select variable_value > 0 from information_schema.global_status diff --git a/mysql-test/suite/perfschema/t/start_server_no_thread_class.test b/mysql-test/suite/perfschema/t/start_server_no_thread_class.test index 1ed0fecb538..df825ede637 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_thread_class.test +++ b/mysql-test/suite/perfschema/t/start_server_no_thread_class.test @@ -23,7 +23,7 @@ # Expect no classes show variables like "performance_schema_max_thread_classes"; -select count(*) from performance_schema.SETUP_INSTRUMENTS +select count(*) from performance_schema.setup_instruments where name like "thread/%"; # We lost all the classes @@ -31,7 +31,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_THREAD_CLASSES_LOST'; # Expect no instances -select count(*) from performance_schema.THREADS; +select count(*) from performance_schema.threads; # Expect no instances lost show status like "performance_schema_thread_instances_lost"; diff --git a/mysql-test/suite/perfschema/t/start_server_no_thread_inst.test b/mysql-test/suite/perfschema/t/start_server_no_thread_inst.test index 489f814ba10..150886d01f9 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_thread_inst.test +++ b/mysql-test/suite/perfschema/t/start_server_no_thread_inst.test @@ -24,7 +24,7 @@ show variables like "performance_schema_max_thread_classes"; # Not observable yet -# select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS +# select count(*) > 0 from performance_schema.setup_instruments # where name like "thread/%"; # Expect no class lost @@ -33,7 +33,7 @@ show status like "performance_schema_thread_classes_lost"; # Expect no instances show variables like "performance_schema_max_thread_instances"; -select count(*) from performance_schema.THREADS; +select count(*) from performance_schema.threads; # Expect instances lost select variable_value > 0 from information_schema.global_status diff --git a/mysql-test/suite/perfschema/t/tampered_perfschema_table1.test b/mysql-test/suite/perfschema/t/tampered_perfschema_table1.test index be079bacfbf..741b41ec46b 100644 --- a/mysql-test/suite/perfschema/t/tampered_perfschema_table1.test +++ b/mysql-test/suite/perfschema/t/tampered_perfschema_table1.test @@ -27,18 +27,18 @@ --source include/not_embedded.inc --source include/have_perfschema.inc -# The message prints 'mysql.SETUP_INSTRUMENTS' -# instead of 'performance_schema.SETUP_INSTRUMENTS', +# The message prints 'mysql.setup_instruments' +# instead of 'performance_schema.setup_instruments', # due to Bug#46792 call mtr.add_suppression( -"Column count of mysql.SETUP_INSTRUMENTS is wrong. " +"Column count of mysql.setup_instruments is wrong. " "Expected 4, found 3. The table is probably corrupted"); --error ER_WRONG_NATIVE_TABLE_STRUCTURE -select * from performance_schema.SETUP_INSTRUMENTS limit 1; +select * from performance_schema.setup_instruments limit 1; --disable_result_log -select * from performance_schema.SETUP_CONSUMERS limit 1; +select * from performance_schema.setup_consumers limit 1; --enable_result_log diff --git a/mysql-test/suite/perfschema/t/thread_cache.test b/mysql-test/suite/perfschema/t/thread_cache.test index a59f568e8a2..488b359cd34 100644 --- a/mysql-test/suite/perfschema/t/thread_cache.test +++ b/mysql-test/suite/perfschema/t/thread_cache.test @@ -30,14 +30,14 @@ connect (con1, localhost, root, , ); let $con1_ID=`select 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()`; connect (con2, localhost, root, , ); let $con2_ID=`select 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()`; connection default; @@ -58,7 +58,7 @@ connect (con3, localhost, root, , ); let $con3_ID=`select connection_id()`; -let $con3_THREAD_ID=`select thread_id from performance_schema.THREADS +let $con3_THREAD_ID=`select thread_id from performance_schema.threads where PROCESSLIST_ID = connection_id()`; disconnect con3; @@ -82,14 +82,14 @@ connect (con1, localhost, root, , ); let $con1_ID=`select 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()`; connect (con2, localhost, root, , ); let $con2_ID=`select 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()`; connection default; @@ -108,7 +108,7 @@ connect (con3, localhost, root, , ); let $con3_ID=`select connection_id()`; -let $con3_THREAD_ID=`select thread_id from performance_schema.THREADS +let $con3_THREAD_ID=`select thread_id from performance_schema.threads where PROCESSLIST_ID = connection_id()`; disconnect con3; |