From 97057115962d9dfbe989c799cff089aec5cbcc60 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Mon, 9 Aug 2010 11:32:50 +0300 Subject: WL#1054: Pluggable authentication support Merged the implementation to a new base tree. --- mysql-test/suite/perfschema/r/column_privilege.result | 1 + mysql-test/suite/perfschema/r/pfs_upgrade.result | 10 +++++----- mysql-test/suite/perfschema/r/privilege.result | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/column_privilege.result b/mysql-test/suite/perfschema/r/column_privilege.result index 7bbc59ac452..ac6030690dd 100644 --- a/mysql-test/suite/perfschema/r/column_privilege.result +++ b/mysql-test/suite/perfschema/r/column_privilege.result @@ -1,6 +1,7 @@ show grants; 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 to 'pfs_user_5'@localhost; diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade.result b/mysql-test/suite/perfschema/r/pfs_upgrade.result index 2d0d82ef19c..9e2018f5c11 100644 --- a/mysql-test/suite/perfschema/r/pfs_upgrade.result +++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result @@ -26,7 +26,7 @@ ERROR 1050 (42S01) at line 445: Table 'SETUP_CONSUMERS' already exists ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists -ERROR 1644 (HY000) at line 1138: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 1142: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -57,7 +57,7 @@ ERROR 1050 (42S01) at line 445: Table 'SETUP_CONSUMERS' already exists ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists -ERROR 1644 (HY000) at line 1138: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 1142: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -86,7 +86,7 @@ ERROR 1050 (42S01) at line 445: Table 'SETUP_CONSUMERS' already exists ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists -ERROR 1644 (HY000) at line 1138: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 1142: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -115,7 +115,7 @@ ERROR 1050 (42S01) at line 445: Table 'SETUP_CONSUMERS' already exists ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists -ERROR 1644 (HY000) at line 1138: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 1142: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -144,7 +144,7 @@ ERROR 1050 (42S01) at line 445: Table 'SETUP_CONSUMERS' already exists ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists -ERROR 1644 (HY000) at line 1138: Unexpected content found in the performance_schema database. +ERROR 1644 (HY000) at line 1142: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.event where db='performance_schema'; name diff --git a/mysql-test/suite/perfschema/r/privilege.result b/mysql-test/suite/perfschema/r/privilege.result index ddbc150a72a..4283b250cee 100644 --- a/mysql-test/suite/perfschema/r/privilege.result +++ b/mysql-test/suite/perfschema/r/privilege.result @@ -1,6 +1,7 @@ show grants; Grants for root@localhost GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION +GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION grant ALL on *.* to 'pfs_user_1'@localhost with GRANT OPTION; grant ALL on performance_schema.* to 'pfs_user_2'@localhost with GRANT OPTION; -- cgit v1.2.1 From 476939cb457d8767e234faa3804322333b0e1c59 Mon Sep 17 00:00:00 2001 From: Dmitry Lenev Date: Thu, 30 Sep 2010 17:29:12 +0400 Subject: Reverted a temporary workaround for bug #56405 "Deadlock in the MDL deadlock detector". It is no longer needed as a better fix for this bug has been pushed. --- mysql-test/suite/perfschema/r/dml_setup_instruments.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result index 7f203118346..2338252976c 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result +++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result @@ -13,7 +13,7 @@ wait/synch/mutex/sql/LOCK_active_mi YES YES 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_dd_owns_lock_open YES YES +wait/synch/mutex/sql/LOCK_delayed_create YES YES 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') -- cgit v1.2.1 From d51cd894dac501d808da0c3bc08636f387014eb3 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Wed, 6 Oct 2010 18:03:27 -0600 Subject: Bug#57154 Rename THREADS.ID to THREADS.PROCESSLIST_ID in 5.5 This change is to align the 5.5 performance_schema.THREADS table definition with the 5.6 performance_schema.THREADS table, to facilitate the 5.5 -> 5.6 migration later. In the table performance_schema.THREADS: - renamed ID to PROCESSLIST_ID, removed not null - changed NAME from varchar(64) to varchar(128) to match the columns definitions from 5.6 Adjusted the test cases accordingly. Note: this fix is for 5.5 only, to null merge into 5.6 --- mysql-test/suite/perfschema/r/dml_threads.result | 6 +++--- mysql-test/suite/perfschema/r/func_file_io.result | 17 +---------------- mysql-test/suite/perfschema/r/selects.result | 18 +++++++++--------- 3 files changed, 13 insertions(+), 28 deletions(-) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/dml_threads.result b/mysql-test/suite/perfschema/r/dml_threads.result index b4fa8705c95..261e7977aa5 100644 --- a/mysql-test/suite/perfschema/r/dml_threads.result +++ b/mysql-test/suite/perfschema/r/dml_threads.result @@ -1,12 +1,12 @@ select * from performance_schema.THREADS where name like 'Thread/%' limit 1; -THREAD_ID ID NAME +THREAD_ID PROCESSLIST_ID NAME # # # select * from performance_schema.THREADS where name='FOO'; -THREAD_ID ID NAME +THREAD_ID PROCESSLIST_ID NAME insert into performance_schema.THREADS -set name='FOO', thread_id=1, id=2; +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 set thread_id=12; diff --git a/mysql-test/suite/perfschema/r/func_file_io.result b/mysql-test/suite/perfschema/r/func_file_io.result index 201254aca21..655ce1394f9 100644 --- a/mysql-test/suite/perfschema/r/func_file_io.result +++ b/mysql-test/suite/perfschema/r/func_file_io.result @@ -94,24 +94,9 @@ FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME WHERE COUNT_STAR > 0 ORDER BY SUM_TIMER_WAIT DESC LIMIT 10; -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) -LEFT JOIN information_schema.PROCESSLIST i USING (ID) -GROUP BY i.user -ORDER BY SUM_WAIT DESC -LIMIT 20; 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) -WHERE p.ID = 1 +WHERE p.PROCESSLIST_ID = 1 GROUP BY h.EVENT_NAME HAVING TOTAL_WAIT > 0; -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) -LEFT JOIN information_schema.PROCESSLIST i USING (ID) -GROUP BY i.user, h.operation -HAVING BYTES > 0 -ORDER BY i.user, h.operation; diff --git a/mysql-test/suite/perfschema/r/selects.result b/mysql-test/suite/perfschema/r/selects.result index dfc9007c740..6d596ba8d9a 100644 --- a/mysql-test/suite/perfschema/r/selects.result +++ b/mysql-test/suite/perfschema/r/selects.result @@ -84,22 +84,22 @@ id c 13 [EVENT_ID] DROP TRIGGER t_ps_trigger; DROP PROCEDURE IF EXISTS t_ps_proc; -CREATE PROCEDURE t_ps_proc(IN tid INT, OUT pid INT) +CREATE PROCEDURE t_ps_proc(IN conid INT, OUT pid INT) BEGIN -SELECT id FROM performance_schema.THREADS -WHERE THREAD_ID = tid INTO pid; +SELECT thread_id FROM performance_schema.THREADS +WHERE PROCESSLIST_ID = conid INTO pid; END; | -CALL t_ps_proc(0, @p_id); +CALL t_ps_proc(connection_id(), @p_id); DROP FUNCTION IF EXISTS t_ps_proc; -CREATE FUNCTION t_ps_func(tid INT) RETURNS int +CREATE FUNCTION t_ps_func(conid INT) RETURNS int BEGIN -return (SELECT id FROM performance_schema.THREADS -WHERE THREAD_ID = tid); +return (SELECT thread_id FROM performance_schema.THREADS +WHERE PROCESSLIST_ID = conid); END; | -SELECT t_ps_func(0) = @p_id; -t_ps_func(0) = @p_id +SELECT t_ps_func(connection_id()) = @p_id; +t_ps_func(connection_id()) = @p_id 1 SELECT * FROM t_event; EVENT_ID -- cgit v1.2.1 From c039e8249717c7d299f454f3b9877382e8fe7849 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Tue, 26 Oct 2010 19:35:02 +0200 Subject: Fixed test result --- mysql-test/suite/perfschema/r/schema.result | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/schema.result b/mysql-test/suite/perfschema/r/schema.result index a802539b7e0..1599d51a59f 100644 --- a/mysql-test/suite/perfschema/r/schema.result +++ b/mysql-test/suite/perfschema/r/schema.result @@ -195,6 +195,6 @@ show create table THREADS; Table Create Table THREADS CREATE TABLE `THREADS` ( `THREAD_ID` int(11) NOT NULL, - `ID` int(11) NOT NULL, - `NAME` varchar(64) NOT NULL + `PROCESSLIST_ID` int(11) DEFAULT NULL, + `NAME` varchar(128) NOT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 -- cgit v1.2.1 From 4e1678daca86af018fb4921a15e87ec28dbaacd1 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Wed, 3 Nov 2010 16:42:33 +0100 Subject: Bug#57609 performance_schema does not work with lower_case_table_names Before this fix, the performance schema tables were defined in UPPERCASE. This was incompatible with the lowercase_table_names option, and caused issues with the install / upgrade process, when changing the lower case table names setting *after* the install or upgrade. With this fix, all performance schema tables are exposed with lowercase names. As a result, the name of the performance schema table is always lowercase, no matter how / if / when the lowercase_table_names setting if changed. --- mysql-test/suite/perfschema/r/aggregate.result | 66 +-- mysql-test/suite/perfschema/r/binlog_mix.result | 16 +- mysql-test/suite/perfschema/r/binlog_row.result | 16 +- mysql-test/suite/perfschema/r/binlog_stmt.result | 20 +- mysql-test/suite/perfschema/r/checksum.result | 68 +-- .../suite/perfschema/r/column_privilege.result | 32 +- .../suite/perfschema/r/ddl_cond_instances.result | 8 +- .../perfschema/r/ddl_events_waits_current.result | 8 +- .../perfschema/r/ddl_events_waits_history.result | 8 +- .../r/ddl_events_waits_history_long.result | 8 +- .../suite/perfschema/r/ddl_ews_by_instance.result | 8 +- .../r/ddl_ews_by_thread_by_event_name.result | 8 +- .../r/ddl_ews_global_by_event_name.result | 8 +- .../suite/perfschema/r/ddl_file_instances.result | 8 +- .../suite/perfschema/r/ddl_fs_by_event_name.result | 8 +- .../suite/perfschema/r/ddl_fs_by_instance.result | 8 +- .../suite/perfschema/r/ddl_mutex_instances.result | 8 +- .../perfschema/r/ddl_performance_timers.result | 8 +- .../suite/perfschema/r/ddl_rwlock_instances.result | 8 +- .../suite/perfschema/r/ddl_setup_consumers.result | 8 +- .../perfschema/r/ddl_setup_instruments.result | 8 +- .../suite/perfschema/r/ddl_setup_timers.result | 8 +- mysql-test/suite/perfschema/r/ddl_threads.result | 8 +- .../suite/perfschema/r/dml_cond_instances.result | 28 +- .../perfschema/r/dml_events_waits_current.result | 32 +- .../perfschema/r/dml_events_waits_history.result | 36 +- .../r/dml_events_waits_history_long.result | 36 +- .../suite/perfschema/r/dml_ews_by_instance.result | 40 +- .../r/dml_ews_by_thread_by_event_name.result | 32 +- .../r/dml_ews_global_by_event_name.result | 32 +- .../suite/perfschema/r/dml_file_instances.result | 28 +- .../r/dml_file_summary_by_event_name.result | 32 +- .../r/dml_file_summary_by_instance.result | 32 +- .../suite/perfschema/r/dml_mutex_instances.result | 28 +- .../perfschema/r/dml_performance_timers.result | 28 +- .../suite/perfschema/r/dml_rwlock_instances.result | 28 +- .../suite/perfschema/r/dml_setup_consumers.result | 28 +- .../perfschema/r/dml_setup_instruments.result | 38 +- .../suite/perfschema/r/dml_setup_timers.result | 30 +- mysql-test/suite/perfschema/r/dml_threads.result | 32 +- mysql-test/suite/perfschema/r/func_file_io.result | 46 +- mysql-test/suite/perfschema/r/func_mutex.result | 48 +- .../suite/perfschema/r/global_read_lock.result | 22 +- .../suite/perfschema/r/information_schema.result | 342 ++++++------- mysql-test/suite/perfschema/r/misc.result | 10 +- .../suite/perfschema/r/myisam_file_io.result | 12 +- mysql-test/suite/perfschema/r/no_threads.result | 22 +- .../suite/perfschema/r/one_thread_per_con.result | 6 +- mysql-test/suite/perfschema/r/privilege.result | 546 ++++++++++----------- mysql-test/suite/perfschema/r/query_cache.result | 8 +- mysql-test/suite/perfschema/r/read_only.result | 18 +- mysql-test/suite/perfschema/r/schema.result | 104 ++-- mysql-test/suite/perfschema/r/selects.result | 42 +- mysql-test/suite/perfschema/r/server_init.result | 104 ++-- .../perfschema/r/start_server_no_cond_class.result | 46 +- .../perfschema/r/start_server_no_cond_inst.result | 46 +- .../perfschema/r/start_server_no_file_class.result | 46 +- .../perfschema/r/start_server_no_file_inst.result | 46 +- .../r/start_server_no_mutex_class.result | 46 +- .../perfschema/r/start_server_no_mutex_inst.result | 46 +- .../r/start_server_no_rwlock_class.result | 46 +- .../r/start_server_no_rwlock_inst.result | 46 +- .../r/start_server_no_thread_class.result | 46 +- .../r/start_server_no_thread_inst.result | 44 +- .../suite/perfschema/r/start_server_off.result | 42 +- .../suite/perfschema/r/start_server_on.result | 42 +- .../perfschema/r/tampered_perfschema_table1.result | 6 +- 67 files changed, 1386 insertions(+), 1386 deletions(-) (limited to 'mysql-test/suite/perfschema/r') 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 ; 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 ; 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 ; 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 NANOSECOND MICROSECOND MILLISECOND TICK -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 -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; -- cgit v1.2.1 From 62e43d42ca45e22e9270e2784566aafe6cad8d00 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Mon, 8 Nov 2010 17:55:38 +0100 Subject: Adjusted test result to lowercase table names --- mysql-test/suite/perfschema/r/pfs_upgrade.result | 170 +++++++++++------------ 1 file changed, 85 insertions(+), 85 deletions(-) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade.result b/mysql-test/suite/perfschema/r/pfs_upgrade.result index 7a782687184..2ec6a3bd1dd 100644 --- a/mysql-test/suite/perfschema/r/pfs_upgrade.result +++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result @@ -8,23 +8,23 @@ use performance_schema; show tables like "user_table"; Tables_in_performance_schema (user_table) user_table -ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists -ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists -ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists -ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists -ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists -ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists -ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists -ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists -ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists -ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists -ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists -ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists -ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists -ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists +ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 478: Table 'threads' already exists ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_table"; @@ -38,23 +38,23 @@ use performance_schema; show tables like "user_view"; Tables_in_performance_schema (user_view) user_view -ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists -ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists -ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists -ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists -ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists -ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists -ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists -ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists -ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists -ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists -ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists -ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists -ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists -ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists +ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 478: Table 'threads' already exists ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_view"; @@ -66,23 +66,23 @@ drop view test.user_view; create procedure test.user_proc() select "Not supposed to be here"; update mysql.proc set db='performance_schema' where name='user_proc'; -ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists -ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists -ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists -ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists -ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists -ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists -ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists -ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists -ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists -ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists -ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists -ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists -ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists -ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists +ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 478: Table 'threads' already exists ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; @@ -94,23 +94,23 @@ drop procedure test.user_proc; create function test.user_func() returns integer return 0; update mysql.proc set db='performance_schema' where name='user_func'; -ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists -ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists -ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists -ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists -ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists -ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists -ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists -ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists -ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists -ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists -ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists -ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists -ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists -ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists +ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 478: Table 'threads' already exists ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; @@ -122,23 +122,23 @@ drop function test.user_func; create event test.user_event on schedule every 1 day do select "not supposed to be here"; update mysql.event set db='performance_schema' where name='user_event'; -ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists -ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists -ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists -ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists -ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists -ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists -ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists -ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists -ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists -ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists -ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists -ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists -ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists -ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists -ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists +ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists +ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists +ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists +ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists +ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists +ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists +ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists +ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 478: Table 'threads' already exists ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.event where db='performance_schema'; -- cgit v1.2.1 From 6bf6272fdabf78e62f04fbcafb1d1e7dee2b27c2 Mon Sep 17 00:00:00 2001 From: Dmitry Lenev Date: Thu, 11 Nov 2010 20:11:05 +0300 Subject: Patch that refactors global read lock implementation and fixes bug #57006 "Deadlock between HANDLER and FLUSH TABLES WITH READ LOCK" and bug #54673 "It takes too long to get readlock for 'FLUSH TABLES WITH READ LOCK'". The first bug manifested itself as a deadlock which occurred when a connection, which had some table open through HANDLER statement, tried to update some data through DML statement while another connection tried to execute FLUSH TABLES WITH READ LOCK concurrently. What happened was that FTWRL in the second connection managed to perform first step of GRL acquisition and thus blocked all upcoming DML. After that it started to wait for table open through HANDLER statement to be flushed. When the first connection tried to execute DML it has started to wait for GRL/the second connection creating deadlock. The second bug manifested itself as starvation of FLUSH TABLES WITH READ LOCK statements in cases when there was a constant stream of concurrent DML statements (in two or more connections). This has happened because requests for protection against GRL which were acquired by DML statements were ignoring presence of pending GRL and thus the latter was starved. This patch solves both these problems by re-implementing GRL using metadata locks. Similar to the old implementation acquisition of GRL in new implementation is two-step. During the first step we block all concurrent DML and DDL statements by acquiring global S metadata lock (each DML and DDL statement acquires global IX lock for its duration). During the second step we block commits by acquiring global S lock in COMMIT namespace (commit code acquires global IX lock in this namespace). Note that unlike in old implementation acquisition of protection against GRL in DML and DDL is semi-automatic. We assume that any statement which should be blocked by GRL will either open and acquires write-lock on tables or acquires metadata locks on objects it is going to modify. For any such statement global IX metadata lock is automatically acquired for its duration. The first problem is solved because waits for GRL become visible to deadlock detector in metadata locking subsystem and thus deadlocks like one in the first bug become impossible. The second problem is solved because global S locks which are used for GRL implementation are given preference over IX locks which are acquired by concurrent DML (and we can switch to fair scheduling in future if needed). Important change: FTWRL/GRL no longer blocks DML and DDL on temporary tables. Before this patch behavior was not consistent in this respect: in some cases DML/DDL statements on temporary tables were blocked while in others they were not. Since the main use cases for FTWRL are various forms of backups and temporary tables are not preserved during backups we have opted for consistently allowing DML/DDL on temporary tables during FTWRL/GRL. Important change: This patch changes thread state names which are used when DML/DDL of FTWRL is waiting for global read lock. It is now either "Waiting for global read lock" or "Waiting for commit lock" depending on the stage on which FTWRL is. Incompatible change: To solve deadlock in events code which was exposed by this patch we have to replace LOCK_event_metadata mutex with metadata locks on events. As result we have to prohibit DDL on events under LOCK TABLES. This patch also adds extensive test coverage for interaction of DML/DDL and FTWRL. Performance of new and old global read lock implementations in sysbench tests were compared. There were no significant difference between new and old implementations. mysql-test/include/check_ftwrl_compatible.inc: Added helper script which allows to check that a statement is compatible with FLUSH TABLES WITH READ LOCK. mysql-test/include/check_ftwrl_incompatible.inc: Added helper script which allows to check that a statement is incompatible with FLUSH TABLES WITH READ LOCK. mysql-test/include/handler.inc: Adjusted test case to the fact that now DROP TABLE closes open HANDLERs for the table to be dropped before checking if there active FTWRL in this connection. mysql-test/include/wait_show_condition.inc: Fixed small error in the timeout message. The correct name of variable used as parameter for this script is "$condition" and not "$wait_condition". mysql-test/r/delayed.result: Added test coverage for scenario which triggered assert in metadata locking subsystem. mysql-test/r/events_2.result: Updated test results after prohibiting event DDL operations under LOCK TABLES. mysql-test/r/flush.result: Added test coverage for bug #57006 "Deadlock between HANDLER and FLUSH TABLES WITH READ LOCK". mysql-test/r/flush_read_lock.result: Added test coverage for various aspects of FLUSH TABLES WITH READ LOCK functionality. mysql-test/r/flush_read_lock_kill.result: Adjusted test case after replacing custom global read lock implementation with one based on metadata locks. Use new debug_sync point. Do not disable concurrent inserts as now InnoDB we always use InnoDB table. mysql-test/r/handler_innodb.result: Adjusted test case to the fact that now DROP TABLE closes open HANDLERs for the table to be dropped before checking if there active FTWRL in this connection. mysql-test/r/handler_myisam.result: Adjusted test case to the fact that now DROP TABLE closes open HANDLERs for the table to be dropped before checking if there active FTWRL in this connection. mysql-test/r/mdl_sync.result: Adjusted test case after replacing custom global read lock implementation with one based on metadata locks. Replaced usage of GRL-specific debug_sync's with appropriate sync points in MDL subsystem. mysql-test/suite/perfschema/r/dml_setup_instruments.result: Updated test results after removing global COND_global_read_lock condition variable. mysql-test/suite/perfschema/r/func_file_io.result: Ensure that this test doesn't affect subsequent tests. At the end of its execution enable back P_S instrumentation which this test disables at some point. mysql-test/suite/perfschema/r/func_mutex.result: Ensure that this test doesn't affect subsequent tests. At the end of its execution enable back P_S instrumentation which this test disables at some point. mysql-test/suite/perfschema/r/global_read_lock.result: Adjusted test case to take into account that new GRL implementation is based on MDL. mysql-test/suite/perfschema/r/server_init.result: Adjusted test case after replacing custom global read lock implementation with one based on MDL and replacing LOCK_event_metadata mutex with metadata lock. mysql-test/suite/perfschema/t/func_file_io.test: Ensure that this test doesn't affect subsequent tests. At the end of its execution enable back P_S instrumentation which this test disables at some point. mysql-test/suite/perfschema/t/func_mutex.test: Ensure that this test doesn't affect subsequent tests. At the end of its execution enable back P_S instrumentation which this test disables at some point. mysql-test/suite/perfschema/t/global_read_lock.test: Adjusted test case to take into account that new GRL implementation is based on MDL. mysql-test/suite/perfschema/t/server_init.test: Adjusted test case after replacing custom global read lock implementation with one based on MDL and replacing LOCK_event_metadata mutex with metadata lock. mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result: Updated test results after prohibiting event DDL under LOCK TABLES. mysql-test/t/delayed.test: Added test coverage for scenario which triggered assert in metadata locking subsystem. mysql-test/t/events_2.test: Updated test case after prohibiting event DDL operations under LOCK TABLES. mysql-test/t/flush.test: Added test coverage for bug #57006 "Deadlock between HANDLER and FLUSH TABLES WITH READ LOCK". mysql-test/t/flush_block_commit.test: Adjusted test case after changing thread state name which is used when COMMIT waits for FLUSH TABLES WITH READ LOCK from "Waiting for release of readlock" to "Waiting for commit lock". mysql-test/t/flush_block_commit_notembedded.test: Adjusted test case after changing thread state name which is used when DML waits for FLUSH TABLES WITH READ LOCK. Now we use "Waiting for global read lock" in this case. mysql-test/t/flush_read_lock.test: Added test coverage for various aspects of FLUSH TABLES WITH READ LOCK functionality. mysql-test/t/flush_read_lock_kill-master.opt: We no longer need to use make_global_read_lock_block_commit_loop debug tag in this test. Instead we rely on an appropriate debug_sync point in MDL code. mysql-test/t/flush_read_lock_kill.test: Adjusted test case after replacing custom global read lock implementation with one based on metadata locks. Use new debug_sync point. Do not disable concurrent inserts as now InnoDB we always use InnoDB table. mysql-test/t/lock_multi.test: Adjusted test case after changing thread state names which are used when DML or DDL waits for FLUSH TABLES WITH READ LOCK to "Waiting for global read lock". mysql-test/t/mdl_sync.test: Adjusted test case after replacing custom global read lock implementation with one based on metadata locks. Replaced usage of GRL-specific debug_sync's with appropriate sync points in MDL subsystem. Updated thread state names which are used when DDL waits for FTWRL. mysql-test/t/trigger_notembedded.test: Adjusted test case after changing thread state names which are used when DML or DDL waits for FLUSH TABLES WITH READ LOCK to "Waiting for global read lock". sql/event_data_objects.cc: Removed Event_queue_element::status/last_executed_changed members and Event_queue_element::update_timing_fields() method. We no longer use this class for updating mysql.events once event is chosen for execution. Accesses to instances of this class in scheduler thread require protection by Event_queue::LOCK_event_queue mutex and we try to avoid updating table while holding this lock. sql/event_data_objects.h: Removed Event_queue_element::status/last_executed_changed members and Event_queue_element::update_timing_fields() method. We no longer use this class for updating mysql.events once event is chosen for execution. Accesses to instances of this class in scheduler thread require protection by Event_queue::LOCK_event_queue mutex and we try to avoid updating table while holding this lock. sql/event_db_repository.cc: - Changed Event_db_repository methods to not release all metadata locks once they are done updating mysql.events table. This allows to keep metadata lock protecting against GRL and lock protecting particular event around until corresponding DDL statement is written to the binary log. - Removed logic for conditional update of "status" and "last_executed" fields from update_timing_fields_for_event() method. In the only case when this method is called now "last_executed" is always modified and tracking change of "status" is too much hassle. sql/event_db_repository.h: Removed logic for conditional update of "status" and "last_executed" fields from Event_db_repository:: update_timing_fields_for_event() method. In the only case when this method is called now "last_executed" is always modified and tracking change of "status" field is too much hassle. sql/event_queue.cc: Changed event scheduler code not to update mysql.events table while holding Event_queue::LOCK_event_queue mutex. Doing so led to a deadlock with a new GRL implementation. This deadlock didn't occur with old implementation due to fact that code acquiring protection against GRL ignored pending GRL requests (which lead to GRL starvation). One of goals of new implementation is to disallow GRL starvation and so we have to solve problem with this deadlock in a different way. sql/events.cc: Changed methods of Events class to acquire protection against GRL while perfoming DDL statement and keep it until statement is written to the binary log. Unfortunately this step together with new GRL implementation exposed deadlock involving Events::LOCK_event_metadata and GRL. To solve it Events::LOCK_event_metadata mutex was replaced with a metadata lock on event. As a side-effect events DDL has to be prohibited under LOCK TABLES even in cases when mysql.events table was explicitly locked for write. sql/events.h: Replaced Events::LOCK_event_metadata mutex with a metadata lock on event. sql/ha_ndbcluster.cc: Updated code after replacing custom global read lock implementation with one based on MDL. Since MDL subsystem should now be able to detect deadlocks involving metadata locks and GRL there is no need for special handling of active GRL. sql/handler.cc: Replaced custom implementation of global read lock with one based on metadata locks. Consequently when doing commit instead of calling method of Global_read_lock class to acquire protection against GRL we simply acquire IX in COMMIT namespace. sql/lock.cc: Replaced custom implementation of global read lock with one based on metadata locks. This step allows to expose wait for GRL to deadlock detector of MDL subsystem and thus succesfully resolve deadlocks similar to one behind bug #57006 "Deadlock between HANDLER and FLUSH TABLES WITH READ LOCK". It also solves problem with GRL starvation described in bug #54673 "It takes too long to get readlock for 'FLUSH TABLES WITH READ LOCK'" since metadata locks used by GRL give preference to FTWRL statement instead of DML statements (if needed in future this can be changed to fair scheduling). Similar to old implementation of acquisition of GRL is two-step. During the first step we block all concurrent DML and DDL statements by acquiring global S metadata lock (each DML and DDL statement acquires global IX lock for its duration). During the second step we block commits by acquiring global S lock in COMMIT namespace (commit code acquires global IX lock in this namespace). Note that unlike in old implementation acquisition of protection against GRL in DML and DDL is semi-automatic. We assume that any statement which should be blocked by GRL will either open and acquires write-lock on tables or acquires metadata locks on objects it is going to modify. For any such statement global IX metadata lock is automatically acquired for its duration. To support this change: - Global_read_lock::lock/unlock_global_read_lock and make_global_read_lock_block_commit methods were changed accordingly. - Global_read_lock::wait_if_global_read_lock() and start_waiting_global_read_lock() methods were dropped. It is now responsibility of code acquiring metadata locks opening tables to acquire protection against GRL by explicitly taking global IX lock with statement duration. - Global variables, mutex and condition variable used by old implementation was removed. - lock_routine_name() was changed to use statement duration for its global IX lock. It was also renamed to lock_object_name() as it now also used to take metadata locks on events. - Global_read_lock::set_explicit_lock_duration() was added which allows not to release locks used for GRL when leaving prelocked mode. sql/lock.h: - Renamed lock_routine_name() to lock_object_name() and changed its signature to allow its usage for events. - Removed broadcast_refresh() function. It is no longer needed with new GRL implementation. sql/log_event.cc: Release metadata locks with statement duration at the end of processing legacy event for LOAD DATA. This ensures that replication thread processing such event properly releases its protection against global read lock. sql/mdl.cc: Changed MDL subsystem to support new MDL-based implementation of global read lock. Added COMMIT and EVENTS namespaces for metadata locks. Changed thread state name for GLOBAL namespace to "Waiting for global read lock". Optimized MDL_map::find_or_insert() method to avoid taking m_mutex mutex when looking up MDL_lock objects for GLOBAL or COMMIT namespaces. We keep pre-created MDL_lock objects for these namespaces around and simply return pointers to these global objects when needed. Changed MDL_lock/MDL_scoped_lock to properly handle notification of insert delayed handler threads when FTWRL takes global S lock. Introduced concept of lock duration. In addition to locks with transaction duration which work in the way which is similar to how locks worked before (i.e. they are released at the end of transaction), locks with statement and explicit duration were introduced. Locks with statement duration are automatically released at the end of statement. Locks with explicit duration require explicit release and obsolete concept of transactional sentinel. * Changed MDL_request and MDL_ticket classes to support notion of duration. * Changed MDL_context to keep locks with different duration in different lists. Changed code handling ticket list to take this into account. * Changed methods responsible for releasing locks to take into account duration of tickets. Particularly public MDL_context::release_lock() method now only can release tickets with explicit duration (there is still internal method which allows to specify duration). To release locks with statement or transaction duration one have to use release_statement/transactional_locks() methods. * Concept of savepoint for MDL subsystem now has to take into account locks with statement duration. Consequently MDL_savepoint class was introduced and methods working with savepoints were updated accordingly. * Added methods which allow to set duration for one or all locks in the context. sql/mdl.h: Changed MDL subsystem to support new MDL-based implementation of global read lock. Added COMMIT and EVENTS namespaces for metadata locks. Introduced concept of lock duration. In addition to locks with transaction duration which work in the way which is similar to how locks worked before (i.e. they are released at the end of transaction), locks with statement and explicit duration were introduced. Locks with statement duration are automatically released at the end of statement. Locks with explicit duration require explicit release and obsolete concept of transactional sentinel. * Changed MDL_request and MDL_ticket classes to support notion of duration. * Changed MDL_context to keep locks with different duration in different lists. Changed code handling ticket list to take this into account. * Changed methods responsible for releasing locks to take into account duration of tickets. Particularly public MDL_context::release_lock() method now only can release tickets with explicit duration (there is still internal method which allows to specify duration). To release locks with statement or transaction duration one have to use release_statement/transactional_locks() methods. * Concept of savepoint for MDL subsystem now has to take into account locks with statement duration. Consequently MDL_savepoint class was introduced and methods working with savepoints were updated accordingly. * Added methods which allow to set duration for one or all locks in the context. sql/mysqld.cc: Removed global mutex and condition variables which were used by old implementation of GRL. Also we no longer need to initialize Events::LOCK_event_metadata mutex as it was replaced with metadata locks on events. sql/mysqld.h: Removed global variable, mutex and condition variables which were used by old implementation of GRL. sql/rpl_rli.cc: When slave thread closes tables which were open for handling of RBR events ensure that it releases global IX lock which was acquired as protection against GRL. sql/sp.cc: Adjusted code to the new signature of lock_object/routine_name(), to the fact that one now needs specify duration of lock when initializing MDL_request and to the fact that savepoints for MDL subsystem are now represented by MDL_savepoint class. sql/sp_head.cc: Ensure that statements in stored procedures release statement metadata locks and thus release their protectiong against GRL in proper moment in time. Adjusted code to the fact that one now needs specify duration of lock when initializing MDL_request. sql/sql_admin.cc: Adjusted code to the fact that one now needs specify duration of lock when initializing MDL_request. sql/sql_base.cc: - Implemented support for new approach to acquiring protection against global read lock. We no longer acquire such protection explicitly on the basis of statement flags. Instead we always rely on code which is responsible for acquiring metadata locks on object to be changed acquiring this protection. This is achieved by acquiring global IX metadata lock with statement duration. Code doing this also responsible for checking that current connection has no active GRL by calling an Global_read_lock::can_acquire_protection() method. Changed code in open_table() and lock_table_names() accordingly. Note that as result of this change DDL and DML on temporary tables is always compatible with GRL (before it was incompatible in some cases and compatible in other cases). - To speed-up code acquiring protection against GRL introduced m_has_protection_against_grl member in Open_table_context class. It indicates that protection was already acquired sometime during open_tables() execution and new attempts can be skipped. - Thanks to new GRL implementation calls to broadcast_refresh() became unnecessary and were removed. - Adjusted code to the fact that one now needs specify duration of lock when initializing MDL_request and to the fact that savepoints for MDL subsystem are now represented by MDL_savepoint class. sql/sql_base.h: Adjusted code to the fact that savepoints for MDL subsystem are now represented by MDL_savepoint class. Also introduced Open_table_context::m_has_protection_against_grl member which allows to avoid acquiring protection against GRL while opening tables if such protection was already acquired. sql/sql_class.cc: Changed THD::leave_locked_tables_mode() after transactional sentinel for metadata locks was obsoleted by introduction of locks with explicit duration. sql/sql_class.h: - Adjusted code to the fact that savepoints for MDL subsystem are now represented by MDL_savepoint class. - Changed Global_read_lock class according to changes in global read lock implementation: * wait_if_global_read_lock and start_waiting_global_read_lock are now gone. Instead code needing protection against GRL has to acquire global IX metadata lock with statement duration itself. To help it new can_acquire_protection() was introduced. Also as result of the above change m_protection_count member is gone too. * Added m_mdl_blocks_commits_lock member to store metadata lock blocking commits. * Adjusted code to the fact that concept of transactional sentinel was obsoleted by concept of lock duration. - Removed CF_PROTECT_AGAINST_GRL flag as it is no longer necessary. New GRL implementation acquires protection against global read lock automagically when statement acquires metadata locks on tables or other objects it is going to change. sql/sql_db.cc: Adjusted code to the fact that one now needs specify duration of lock when initializing MDL_request. sql/sql_handler.cc: Removed call to broadcast_refresh() function. It is no longer needed with new GRL implementation. Adjusted code after introducing duration concept for metadata locks. Particularly to the fact transactional sentinel was replaced with explicit duration. sql/sql_handler.h: Renamed mysql_ha_move_tickets_after_trans_sentinel() to mysql_ha_set_explicit_lock_duration() after transactional sentinel was obsoleted by locks with explicit duration. sql/sql_insert.cc: Adjusted code handling delaying inserts after switching to new GRL implementation. Now connection thread initiating delayed insert has to acquire global IX lock in addition to metadata lock on table being inserted into. This IX lock protects against GRL and similarly to SW lock on table being inserted into has to be passed to handler thread in order to avoid deadlocks. sql/sql_lex.cc: LEX::protect_against_global_read_lock member is no longer necessary since protection against GRL is automatically taken by code acquiring metadata locks/opening tables. sql/sql_lex.h: LEX::protect_against_global_read_lock member is no longer necessary since protection against GRL is automatically taken by code acquiring metadata locks/opening tables. sql/sql_parse.cc: - Implemented support for new approach to acquiring protection against global read lock. We no longer acquire such protection explicitly on the basis of statement flags. Instead we always rely on code which is responsible for acquiring metadata locks on object to be changed acquiring this protection. This is achieved by acquiring global IX metadata lock with statement duration. This lock is automatically released at the end of statement execution. - Changed implementation of CREATE/DROP PROCEDURE/FUNCTION not to release metadata locks and thus protection against of GRL in the middle of statement execution. - Adjusted code to the fact that one now needs specify duration of lock when initializing MDL_request and to the fact that savepoints for MDL subsystem are now represented by MDL_savepoint class. sql/sql_prepare.cc: Adjusted code to the to the fact that savepoints for MDL subsystem are now represented by MDL_savepoint class. sql/sql_rename.cc: With new GRL implementation there is no need to explicitly acquire protection against GRL before renaming tables. This happens automatically in code which acquires metadata locks on tables being renamed. sql/sql_show.cc: Adjusted code to the fact that one now needs specify duration of lock when initializing MDL_request and to the fact that savepoints for MDL subsystem are now represented by MDL_savepoint class. sql/sql_table.cc: - With new GRL implementation there is no need to explicitly acquire protection against GRL before dropping tables. This happens automatically in code which acquires metadata locks on tables being dropped. - Changed mysql_alter_table() not to release lock on new table name explicitly and to rely on automatic release of locks at the end of statement instead. This was necessary since now MDL_context::release_lock() is supported only for locks for explicit duration. sql/sql_trigger.cc: With new GRL implementation there is no need to explicitly acquire protection against GRL before changing table triggers. This happens automatically in code which acquires metadata locks on tables which triggers are to be changed. sql/sql_update.cc: Fix bug exposed by GRL testing. During prepare phase acquire only S metadata locks instead of SW locks to keep prepare of multi-UPDATE compatible with concurrent LOCK TABLES WRITE and global read lock. sql/sql_view.cc: With new GRL implementation there is no need to explicitly acquire protection against GRL before creating view. This happens automatically in code which acquires metadata lock on view to be created. sql/sql_yacc.yy: LEX::protect_against_global_read_lock member is no longer necessary since protection against GRL is automatically taken by code acquiring metadata locks/opening tables. sql/table.cc: Adjusted code to the fact that one now needs specify duration of lock when initializing MDL_request. sql/table.h: Adjusted code to the fact that one now needs specify duration of lock when initializing MDL_request. sql/transaction.cc: Replaced custom implementation of global read lock with one based on metadata locks. Consequently when doing commit instead of calling method of Global_read_lock class to acquire protection against GRL we simply acquire IX in COMMIT namespace. Also adjusted code to the fact that MDL savepoint is now represented by MDL_savepoint class. --- mysql-test/suite/perfschema/r/dml_setup_instruments.result | 2 +- mysql-test/suite/perfschema/r/func_file_io.result | 1 + mysql-test/suite/perfschema/r/func_mutex.result | 1 + mysql-test/suite/perfschema/r/global_read_lock.result | 5 +++-- mysql-test/suite/perfschema/r/server_init.result | 12 ------------ 5 files changed, 6 insertions(+), 15 deletions(-) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result index 2338252976c..15174ee40bf 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result +++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result @@ -37,7 +37,6 @@ where name like 'Wait/Synch/Cond/sql/%' order by name limit 10; NAME ENABLED TIMED wait/synch/cond/sql/COND_flush_thread_cache YES YES -wait/synch/cond/sql/COND_global_read_lock YES YES wait/synch/cond/sql/COND_manager YES YES wait/synch/cond/sql/COND_queue_state YES YES wait/synch/cond/sql/COND_rpl_status YES YES @@ -46,6 +45,7 @@ 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 +wait/synch/cond/sql/Event_scheduler::COND_state YES YES select * from performance_schema.SETUP_INSTRUMENTS where name='Wait'; select * from performance_schema.SETUP_INSTRUMENTS diff --git a/mysql-test/suite/perfschema/r/func_file_io.result b/mysql-test/suite/perfschema/r/func_file_io.result index 655ce1394f9..8314bed94bf 100644 --- a/mysql-test/suite/perfschema/r/func_file_io.result +++ b/mysql-test/suite/perfschema/r/func_file_io.result @@ -100,3 +100,4 @@ INNER JOIN performance_schema.THREADS p USING (THREAD_ID) WHERE p.PROCESSLIST_ID = 1 GROUP BY h.EVENT_NAME HAVING TOTAL_WAIT > 0; +UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES'; diff --git a/mysql-test/suite/perfschema/r/func_mutex.result b/mysql-test/suite/perfschema/r/func_mutex.result index e32d7267bb1..93ba4064a90 100644 --- a/mysql-test/suite/perfschema/r/func_mutex.result +++ b/mysql-test/suite/perfschema/r/func_mutex.result @@ -110,4 +110,5 @@ 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 Success +UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES'; DROP TABLE t1; diff --git a/mysql-test/suite/perfschema/r/global_read_lock.result b/mysql-test/suite/perfschema/r/global_read_lock.result index 93d6adfd049..365ac095e84 100644 --- a/mysql-test/suite/perfschema/r/global_read_lock.result +++ b/mysql-test/suite/perfschema/r/global_read_lock.result @@ -1,4 +1,5 @@ use performance_schema; +update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; grant SELECT, UPDATE, LOCK TABLES on performance_schema.* to pfsuser@localhost; flush privileges; connect (con1, localhost, pfsuser, , test); @@ -21,9 +22,9 @@ select event_name, left(source, locate(":", source)) as short_source, timer_end, timer_wait, operation from performance_schema.EVENTS_WAITS_CURRENT -where event_name like "wait/synch/cond/sql/COND_global_read_lock"; +where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status"; event_name short_source timer_end timer_wait operation -wait/synch/cond/sql/COND_global_read_lock lock.cc: NULL NULL wait +wait/synch/cond/sql/MDL_context::COND_wait_status mdl.cc: NULL NULL timed_wait unlock tables; update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/server_init.result b/mysql-test/suite/perfschema/r/server_init.result index 0c1e06d157c..474a481929a 100644 --- a/mysql-test/suite/perfschema/r/server_init.result +++ b/mysql-test/suite/perfschema/r/server_init.result @@ -88,10 +88,6 @@ where name like "wait/synch/mutex/sql/LOCK_manager"; count(name) 1 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 where name like "wait/synch/mutex/sql/LOCK_global_system_variables"; count(name) 1 @@ -120,10 +116,6 @@ where name like "wait/synch/mutex/sql/Query_cache::structure_guard_mutex"; count(name) 1 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 where name like "wait/synch/mutex/sql/LOCK_event_queue"; count(name) 1 @@ -184,10 +176,6 @@ where name like "wait/synch/cond/sql/COND_manager"; count(name) 1 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 where name like "wait/synch/cond/sql/COND_thread_cache"; count(name) 1 -- cgit v1.2.1 From b1f25ee9f79548ac941a0d2ad285f3994c47723f Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Wed, 1 Dec 2010 09:01:04 +0100 Subject: Bug#58621 perfschema.dml_ews_by_thread_by_event_name test failure This fix affects the test suite only. Before this fix, performance schema tests dml_*.test could fail with spurious failure, depending on the table content. This fix simplifies the SELECT tests in the dml_*.test scripts, to only verify that the SELECT operation passed the security checks and succeeded, which was the original intent of the test. Usage of --replace_column 1 # 2 # 3 # 4 # ... to discard the test output was replaced by a simpler and more maintainable --disable_result_log which also work for empty tables. --- mysql-test/suite/perfschema/r/dml_cond_instances.result | 3 --- mysql-test/suite/perfschema/r/dml_events_waits_current.result | 3 --- mysql-test/suite/perfschema/r/dml_events_waits_history.result | 7 ------- .../suite/perfschema/r/dml_events_waits_history_long.result | 7 ------- mysql-test/suite/perfschema/r/dml_ews_by_instance.result | 11 ----------- .../suite/perfschema/r/dml_ews_by_thread_by_event_name.result | 3 --- .../suite/perfschema/r/dml_ews_global_by_event_name.result | 3 --- mysql-test/suite/perfschema/r/dml_file_instances.result | 3 --- .../suite/perfschema/r/dml_file_summary_by_event_name.result | 3 --- .../suite/perfschema/r/dml_file_summary_by_instance.result | 3 --- mysql-test/suite/perfschema/r/dml_mutex_instances.result | 3 --- mysql-test/suite/perfschema/r/dml_rwlock_instances.result | 3 --- mysql-test/suite/perfschema/r/dml_threads.result | 3 --- 13 files changed, 55 deletions(-) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/dml_cond_instances.result b/mysql-test/suite/perfschema/r/dml_cond_instances.result index 922effc59ae..285c32090af 100644 --- a/mysql-test/suite/perfschema/r/dml_cond_instances.result +++ b/mysql-test/suite/perfschema/r/dml_cond_instances.result @@ -1,9 +1,6 @@ select * from performance_schema.cond_instances limit 1; -NAME OBJECT_INSTANCE_BEGIN -# # select * from performance_schema.cond_instances where name='FOO'; -NAME OBJECT_INSTANCE_BEGIN 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' 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 9b0bcf7f876..122cfcce4a1 100644 --- a/mysql-test/suite/perfschema/r/dml_events_waits_current.result +++ b/mysql-test/suite/perfschema/r/dml_events_waits_current.result @@ -1,10 +1,7 @@ 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 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 set thread_id='1', event_id=1, event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; 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 5fc95584c7f..199ccc1cfa5 100644 --- a/mysql-test/suite/perfschema/r/dml_events_waits_history.result +++ b/mysql-test/suite/perfschema/r/dml_events_waits_history.result @@ -1,18 +1,11 @@ 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 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 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 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 set thread_id='1', event_id=1, event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; 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 2ce949b2228..773dcd3b1dc 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,18 +1,11 @@ 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 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 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 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 set thread_id='1', event_id=1, event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; 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 0a745a2c38a..6ba37025d3b 100644 --- a/mysql-test/suite/perfschema/r/dml_ews_by_instance.result +++ b/mysql-test/suite/perfschema/r/dml_ews_by_instance.result @@ -1,26 +1,15 @@ 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 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 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 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 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 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 set event_name='FOO', object_instance_begin=0, count_star=1, sum_timer_wait=2, min_timer_wait=3, 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 c64bcdd40f6..a98acb5f536 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,10 +1,7 @@ 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 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 set event_name='FOO', thread_id=1, count_star=1, sum_timer_wait=2, min_timer_wait=3, 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 c59451922c5..159adbd8022 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,10 +1,7 @@ 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 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 set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3, avg_timer_wait=4, max_timer_wait=5; diff --git a/mysql-test/suite/perfschema/r/dml_file_instances.result b/mysql-test/suite/perfschema/r/dml_file_instances.result index 5a51a4ca018..4a8a7ac4d47 100644 --- a/mysql-test/suite/perfschema/r/dml_file_instances.result +++ b/mysql-test/suite/perfschema/r/dml_file_instances.result @@ -1,9 +1,6 @@ select * from performance_schema.file_instances limit 1; -FILE_NAME EVENT_NAME OPEN_COUNT -# # # select * from performance_schema.file_instances where file_name='FOO'; -FILE_NAME EVENT_NAME OPEN_COUNT 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' 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 97a196dbf19..a8a9fe852bb 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,10 +1,7 @@ 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 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 set event_name='FOO', count_read=1, count_write=2, sum_number_of_bytes_read=4, sum_number_of_bytes_write=5; 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 d85e23cb6f4..456d6e31173 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,10 +1,7 @@ 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 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 set event_name='FOO', count_read=1, count_write=2, sum_number_of_bytes_read=4, sum_number_of_bytes_write=5; diff --git a/mysql-test/suite/perfschema/r/dml_mutex_instances.result b/mysql-test/suite/perfschema/r/dml_mutex_instances.result index 1ea7311b149..665517c7227 100644 --- a/mysql-test/suite/perfschema/r/dml_mutex_instances.result +++ b/mysql-test/suite/perfschema/r/dml_mutex_instances.result @@ -1,9 +1,6 @@ select * from performance_schema.mutex_instances limit 1; -NAME OBJECT_INSTANCE_BEGIN LOCKED_BY_THREAD_ID -# # # select * from performance_schema.mutex_instances where name='FOO'; -NAME OBJECT_INSTANCE_BEGIN LOCKED_BY_THREAD_ID 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' diff --git a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result index 964fa0fa46f..b072eea3955 100644 --- a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result +++ b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result @@ -1,9 +1,6 @@ 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 where name='FOO'; -NAME OBJECT_INSTANCE_BEGIN WRITE_LOCKED_BY_THREAD_ID READ_LOCKED_BY_COUNT 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' diff --git a/mysql-test/suite/perfschema/r/dml_threads.result b/mysql-test/suite/perfschema/r/dml_threads.result index 8c61521d091..b78d1934d1f 100644 --- a/mysql-test/suite/perfschema/r/dml_threads.result +++ b/mysql-test/suite/perfschema/r/dml_threads.result @@ -1,10 +1,7 @@ select * from performance_schema.threads where name like 'Thread/%' limit 1; -THREAD_ID PROCESSLIST_ID NAME -# # # select * from performance_schema.threads where name='FOO'; -THREAD_ID PROCESSLIST_ID NAME 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' -- cgit v1.2.1 From 639b25982b55935b4a3582d4758b18a816e2997f Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Wed, 1 Dec 2010 10:24:16 +0100 Subject: Bug#58512 Performance_schema.myisam_file_io fails sporadically in PB2 Before this fix, the test myisam_file_io executed: - (a) an update on setup_instrument to disable non myisam file io instruments - (b) a truncate on events_waits_history_long and later - (c) a select on events_waits_history_long Surprisingly, events that were supposed to be disabled in (a) and removed in (b) still were found in (c). This happened for events such as wait/io/file/innodb/innodb_data_file fil0fil.c: sync because the sync was started before (a) and completed after (b), and as a consequence was added in the performance schema history, as expected. Presence of these records in the history made the test fail. This fix makes the test script more robust to account for extra spill waits records in (c). --- mysql-test/suite/perfschema/r/myisam_file_io.result | 1 + 1 file changed, 1 insertion(+) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/myisam_file_io.result b/mysql-test/suite/perfschema/r/myisam_file_io.result index 287abd43d74..5cdcf6ac789 100644 --- a/mysql-test/suite/perfschema/r/myisam_file_io.result +++ b/mysql-test/suite/perfschema/r/myisam_file_io.result @@ -16,6 +16,7 @@ operation, number_of_bytes, substring(object_name, locate("no_index_tab", object_name)) as short_name from performance_schema.events_waits_history_long where operation not like "tell" + and event_name like "wait/io/file/myisam/%" order by thread_id, event_id; event_name short_source operation number_of_bytes short_name wait/io/file/myisam/kfile mi_create.c: create NULL no_index_tab.MYI -- cgit v1.2.1 From ea35bf7a71a5e05d897df0e0b40c85f65cccf270 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Wed, 1 Dec 2010 11:10:15 +0100 Subject: Bug#56618 Thread_ID is not assigned in ascending sequence (after disconnect) Before this fix, the test thread_cache failed with spurious failures. The test used: -- disconnect X -- connect Y while assuming that connection Y would reuse connection X slot in the thread cache. For this to happen, the disconnect X operation must be given enough time to complete, otherwise connect Y can be executed in the server before X actually finishes. This fix uses wait conditions to make the test execution more controlled, and more reproductible. --- mysql-test/suite/perfschema/r/thread_cache.result | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/thread_cache.result b/mysql-test/suite/perfschema/r/thread_cache.result index de4d19f9c64..f64cadc2705 100644 --- a/mysql-test/suite/perfschema/r/thread_cache.result +++ b/mysql-test/suite/perfschema/r/thread_cache.result @@ -1,3 +1,4 @@ +flush status; SET @saved_thread_cache_size = @@global.thread_cache_size; set global thread_cache_size = 0; show variables like "thread_cache_size"; @@ -32,3 +33,7 @@ select @thread_id_increment; @thread_id_increment 1 set global thread_cache_size = @saved_thread_cache_size; +show status like "performance_schema_thread%"; +Variable_name Value +Performance_schema_thread_classes_lost 0 +Performance_schema_thread_instances_lost 0 -- cgit v1.2.1 From 4372875aa1fb307c33531ec63aa83bb7ae3932e9 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Wed, 1 Dec 2010 13:06:41 +0100 Subject: Bug#53696 Performance schema engine violates the PSEA API by calling my_error() This is a code cleanup. The implementation of a storage engine (subclasses of handler) is not supposed to call my_error() directly inside the engine implementation, but only return error codes, and report errors later at the demand of the sql layer only (if needed), using handler::print_error(). This fix removes misplaced calls to my_error(), and provide an implementation of print_error() instead. Given that the sql layer implementation of create table, ha_create_table(), does not use print_error() but returns ER_CANT_CREATE_TABLE directly, the return code for create table statements using the performance schema has changed to ER_CANT_CREATE_TABLE. Adjusted the test suite accordingly. --- mysql-test/suite/perfschema/r/misc.result | 4 ++-- mysql-test/suite/perfschema/r/privilege.result | 32 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/misc.result b/mysql-test/suite/perfschema/r/misc.result index 4e9b08e00ef..2f66f80ed75 100644 --- a/mysql-test/suite/perfschema/r/misc.result +++ b/mysql-test/suite/perfschema/r/misc.result @@ -6,9 +6,9 @@ AND EVENT_NAME IN WHERE NAME LIKE "wait/synch/%") LIMIT 1; create table test.t1(a int) engine=performance_schema; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table performance_schema.t1(a int); ERROR 42000: CREATE command denied to user 'root'@'localhost' for table 't1' drop table if exists test.ghost; diff --git a/mysql-test/suite/perfschema/r/privilege.result b/mysql-test/suite/perfschema/r/privilege.result index 61f5adac354..d1831c9c4be 100644 --- a/mysql-test/suite/perfschema/r/privilege.result +++ b/mysql-test/suite/perfschema/r/privilege.result @@ -152,13 +152,13 @@ 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. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table test.t1 like performance_schema.setup_instruments; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table test.t1 like performance_schema.file_instances; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) insert into performance_schema.setup_instruments set name="foo"; ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments' @@ -250,13 +250,13 @@ 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. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table test.t1 like performance_schema.setup_instruments; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table test.t1 like performance_schema.file_instances; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) insert into performance_schema.setup_instruments set name="foo"; ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments' @@ -348,13 +348,13 @@ 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. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table test.t1 like performance_schema.setup_instruments; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table test.t1 like performance_schema.file_instances; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) insert into performance_schema.setup_instruments set name="foo"; ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments' @@ -446,13 +446,13 @@ 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. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table test.t1 like performance_schema.setup_instruments; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table test.t1 like performance_schema.events_waits_current; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) create table test.t1 like performance_schema.file_instances; -ERROR HY000: Invalid performance_schema usage. +ERROR HY000: Can't create table 'test.t1' (errno: 131) insert into performance_schema.setup_instruments set name="foo"; ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments' -- cgit v1.2.1 From 630483d497ceb7afdd58181d890716ba4d6130dc Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Tue, 4 Jan 2011 10:04:02 +0100 Subject: Bug#59091 perfschema.binlog_mix and perfschema.binlog_row tests fail with openssl Fixed the test case to be independent of build options used. Removed the lowercase-table-names constraint, since performance schema tables are now in lowercase. --- mysql-test/suite/perfschema/r/binlog_mix.result | 11 ++++++----- mysql-test/suite/perfschema/r/binlog_row.result | 11 ++++++----- mysql-test/suite/perfschema/r/binlog_stmt.result | 18 ++++++++++++------ 3 files changed, 24 insertions(+), 16 deletions(-) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/binlog_mix.result b/mysql-test/suite/perfschema/r/binlog_mix.result index b31b853b06d..3b2ab2bb435 100644 --- a/mysql-test/suite/perfschema/r/binlog_mix.result +++ b/mysql-test/suite/perfschema/r/binlog_mix.result @@ -4,7 +4,8 @@ select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 update performance_schema.setup_instruments set enabled='NO' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); select count(*) > 0 from performance_schema.events_waits_current; count(*) > 0 1 @@ -16,16 +17,17 @@ insert into test.t1 select thread_id from performance_schema.events_waits_current; insert into test.t2 select name from performance_schema.setup_instruments -where name like "wait/synch/rwlock/%"; +where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); drop table test.t1; drop table test.t2; update performance_schema.setup_instruments set enabled='YES' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); show binlog events from ; 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 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ @@ -44,6 +46,5 @@ 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 # 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 010f2de06e6..644e5d58e23 100644 --- a/mysql-test/suite/perfschema/r/binlog_row.result +++ b/mysql-test/suite/perfschema/r/binlog_row.result @@ -4,7 +4,8 @@ select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 update performance_schema.setup_instruments set enabled='NO' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); select count(*) > 0 from performance_schema.events_waits_current; count(*) > 0 1 @@ -16,16 +17,17 @@ insert into test.t1 select thread_id from performance_schema.events_waits_current; insert into test.t2 select name from performance_schema.setup_instruments -where name like "wait/synch/rwlock/%"; +where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); drop table test.t1; drop table test.t2; update performance_schema.setup_instruments set enabled='YES' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); show binlog events from ; 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 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ @@ -44,6 +46,5 @@ 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 # 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 60054ee8a74..3fcecfdd1ca 100644 --- a/mysql-test/suite/perfschema/r/binlog_stmt.result +++ b/mysql-test/suite/perfschema/r/binlog_stmt.result @@ -5,7 +5,8 @@ select count(*) > 0 from performance_schema.setup_instruments; count(*) > 0 1 update performance_schema.setup_instruments set enabled='NO' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); 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; @@ -21,20 +22,23 @@ 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 -where name like "wait/synch/rwlock/%"; +where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); 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' - where name like "wait/synch/rwlock/%"; + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock"); 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 ; 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' - where name like "wait/synch/rwlock/%" + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock") master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */ @@ -47,11 +51,13 @@ 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 -where name like "wait/synch/rwlock/%" +where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock") 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' - where name like "wait/synch/rwlock/%" + where name like "wait/synch/rwlock/sql/%" + and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock") master-bin.000001 # Query # # COMMIT -- cgit v1.2.1 From eb58939395bace2897a0dcc2139159db72a874fb Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Wed, 12 Jan 2011 18:36:39 -0200 Subject: Bug#42054: SELECT CURDATE() is returning bad value The problem from a user point of view was that on Solaris the time related functions (e.g. NOW(), SYSDATE(), etc) would always return a fixed time. This bug was happening due to a logic in the time retrieving wrapper function which would only call the time() function every half second. This interval between calls would be calculated using the gethrtime() and the logic relied on the fact that time returned by it is monotonic. Unfortunately, due to bugs in the gethrtime() implementation, there are some cases where the time returned by it can drift (See Solaris bug id 6600939), potentially causing the interval calculation logic to fail. Since newer versions of Solaris (10+) have alleviated the performance degradation associated with time(2), the solution is to simply directly rely on time() at each invocation. This simplification has an upside that it allows us to eliminate a lock which was used to control access to the variables used to track the half second interval, thus improving the overall scalability of timekeeping related functions (e.g. NOW()). Benchmarks runs have shown no significant degradation associated with this change. With this, there are actually improvements in performance for cases involving many connections. In summary, the changes introduced by this patch are: a) my_time() and my_micro_time_and_time() no longer use gethrtime(). Instead, time() and gettimeofdate() are used correspondingly. b) my_micro_time() is changed to not use gethrtime() so as to have the same time source as my_micro_time_and_time(). There shouldn't be any performance impact from this change since this function is used only a few times during statement execution and, on Solaris, gettimeofday() shows acceptable performance. mysys/my_getsystime.c: Use time() even if gethrtime() is available. Remove logic which relied on gethrtime() to only call time() every half second. Since gethrtime() is not used anymore, also remove it from my_micro_time() to keep a common time source. Also, function comments are cleaned up (fixed typos and wrong information) and converted to doxygen. mysys/my_thr_init.c: Remove mutex which is no longer used. mysys/mysys_priv.h: Remove mutex which is no longer used. --- mysql-test/suite/perfschema/r/server_init.result | 4 ---- 1 file changed, 4 deletions(-) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/server_init.result b/mysql-test/suite/perfschema/r/server_init.result index b6f1d4828c3..26104197686 100644 --- a/mysql-test/suite/perfschema/r/server_init.result +++ b/mysql-test/suite/perfschema/r/server_init.result @@ -31,10 +31,6 @@ 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 -where name like "wait/synch/mutex/mysys/THR_LOCK_time"; -count(name) -1 select count(name) from cond_instances where name like "wait/synch/cond/mysys/THR_COND_threads"; count(name) -- cgit v1.2.1 From 5ee90018446bcb10c4a85f03eee968f99de4fa97 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Tue, 1 Mar 2011 17:39:28 +0100 Subject: Bug#11766528 PERFORMANCE_SCHEMA TRACKS BOTH BINARY AND RELAY LOGS IN THE SAME EVENTS Before this fix, all the performance schema instrumentation for both the binary log and the relay log would use the following instruments: - wait/io/file/sql/binlog - wait/io/file/sql/binlog_index - wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index - wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond This instrumentation is too general and can be more specific. With this fix, the binlog instrumentation is identical, and the relay log instrumentation is changed to: - wait/io/file/sql/relaylog - wait/io/file/sql/relaylog_index - wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index - wait/synch/cond/sql/MYSQL_RELAY_LOG::update_cond With this change, the performance instrumentation for the binary log and the relay log, which share the same structure but have different uses, is more detailed. This is especially important for hosts in the middle of a replication chain, that are both masters (binlog) and slaves (relaylog). --- mysql-test/suite/perfschema/r/relaylog.result | 98 +++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 mysql-test/suite/perfschema/r/relaylog.result (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/relaylog.result b/mysql-test/suite/perfschema/r/relaylog.result new file mode 100644 index 00000000000..0cd346b62a1 --- /dev/null +++ b/mysql-test/suite/perfschema/r/relaylog.result @@ -0,0 +1,98 @@ +include/master-slave.inc +[connection master] +drop table if exists test.t1; +reset master; +create table test.t1(a int); +drop table test.t1; +show binlog events from ; +Log_name Pos Event_type Server_id End_log_pos Info +slave-bin.000001 # Query # # use `test`; create table test.t1(a int) +slave-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ +"============ Performance schema on master ============" +select * from performance_schema.file_summary_by_instance +where file_name like "%master-%" order by file_name; +FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE +[DATADIR]master-bin.000001 wait/io/file/sql/binlog 6 4 221 329 +[DATADIR]master-bin.index wait/io/file/sql/binlog_index 0 2 0 40 +select * from performance_schema.file_summary_by_instance +where file_name like "%slave-%" order by file_name; +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 +where event_name like "%binlog%" order by file_name; +FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE +[DATADIR]master-bin.000001 wait/io/file/sql/binlog 6 4 221 329 +[DATADIR]master-bin.index wait/io/file/sql/binlog_index 0 2 0 40 +select * from performance_schema.file_summary_by_event_name +where event_name like "%binlog%" order by event_name; +EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE +wait/io/file/sql/binlog 6 4 221 329 +wait/io/file/sql/binlog_index 0 2 0 40 +select event_name, count_star +from performance_schema.events_waits_summary_global_by_event_name +where event_name like "%MYSQL_BIN_LOG%" order by event_name; +event_name count_star +wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids 0 +wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond 1 +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index 3 +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids 0 +select * from performance_schema.file_summary_by_instance +where event_name like "%relaylog%" order by file_name; +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_event_name +where event_name like "%relaylog%" order by event_name; +EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE +wait/io/file/sql/relaylog 0 0 0 0 +wait/io/file/sql/relaylog_index 0 0 0 0 +select * from performance_schema.events_waits_summary_global_by_event_name +where event_name like "%MYSQL_RELAY_LOG%" order by event_name; +EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT +wait/synch/cond/sql/MYSQL_RELAY_LOG::update_cond 0 0 0 0 0 +wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index 0 0 0 0 0 +"============ Performance schema on slave ============" +select * from performance_schema.file_summary_by_instance +where file_name like "%master-%" order by file_name; +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 +where file_name like "%slave-%" order by file_name; +FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE +[DATADIR]slave-bin.000001 wait/io/file/sql/binlog 3 8 602 631 +[DATADIR]slave-bin.index wait/io/file/sql/binlog_index 0 3 0 57 +[DATADIR]slave-relay-bin.000001 wait/io/file/sql/relaylog 4 3 370 263 +[DATADIR]slave-relay-bin.000002 wait/io/file/sql/relaylog 2 4 368 368 +[DATADIR]slave-relay-bin.index wait/io/file/sql/relaylog_index 2 4 50 125 +select * from performance_schema.file_summary_by_instance +where event_name like "%binlog%" order by file_name; +FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE +[DATADIR]slave-bin.000001 wait/io/file/sql/binlog 3 8 602 631 +[DATADIR]slave-bin.index wait/io/file/sql/binlog_index 0 3 0 57 +select * from performance_schema.file_summary_by_event_name +where event_name like "%binlog%" order by event_name; +EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE +wait/io/file/sql/binlog 3 8 602 631 +wait/io/file/sql/binlog_index 0 3 0 57 +select event_name, count_star +from performance_schema.events_waits_summary_global_by_event_name +where event_name like "%MYSQL_BIN_LOG%" order by event_name; +event_name count_star +wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids 0 +wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond 0 +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index 5 +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids 0 +select * from performance_schema.file_summary_by_instance +where event_name like "%relaylog%" order by file_name; +FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE +[DATADIR]slave-relay-bin.000001 wait/io/file/sql/relaylog 4 3 370 263 +[DATADIR]slave-relay-bin.000002 wait/io/file/sql/relaylog 2 4 368 368 +[DATADIR]slave-relay-bin.index wait/io/file/sql/relaylog_index 2 4 50 125 +select * from performance_schema.file_summary_by_event_name +where event_name like "%relaylog%" order by event_name; +EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE +wait/io/file/sql/relaylog 6 7 738 631 +wait/io/file/sql/relaylog_index 2 4 50 125 +select event_name, count_star +from performance_schema.events_waits_summary_global_by_event_name +where event_name like "%MYSQL_RELAY_LOG%" order by event_name; +event_name count_star +wait/synch/cond/sql/MYSQL_RELAY_LOG::update_cond 2 +wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index 12 +include/stop_slave.inc -- cgit v1.2.1 From caee7f416f198a73c7aac978bfafb565f50fde03 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Thu, 10 Mar 2011 09:00:43 +0100 Subject: Implemented code review comments, improved the result file readability. --- mysql-test/suite/perfschema/r/relaylog.result | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/relaylog.result b/mysql-test/suite/perfschema/r/relaylog.result index 0cd346b62a1..1ec9f4f4b29 100644 --- a/mysql-test/suite/perfschema/r/relaylog.result +++ b/mysql-test/suite/perfschema/r/relaylog.result @@ -17,6 +17,7 @@ FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_ select * from performance_schema.file_summary_by_instance where file_name like "%slave-%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE +"Expect a master binlog + binlog_index" select * from performance_schema.file_summary_by_instance where event_name like "%binlog%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE @@ -35,6 +36,7 @@ wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids 0 wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond 1 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index 3 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids 0 +"Expect no slave relay log" select * from performance_schema.file_summary_by_instance where event_name like "%relaylog%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE @@ -60,6 +62,7 @@ FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_ [DATADIR]slave-relay-bin.000001 wait/io/file/sql/relaylog 4 3 370 263 [DATADIR]slave-relay-bin.000002 wait/io/file/sql/relaylog 2 4 368 368 [DATADIR]slave-relay-bin.index wait/io/file/sql/relaylog_index 2 4 50 125 +"Expect a slave binlog + binlog_index" select * from performance_schema.file_summary_by_instance where event_name like "%binlog%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE @@ -78,6 +81,7 @@ wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids 0 wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond 0 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index 5 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids 0 +"Expect a slave relay log" select * from performance_schema.file_summary_by_instance where event_name like "%relaylog%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE -- cgit v1.2.1 From 70fd13346d4a3c92d005d6cc71f8a19743d98e94 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Thu, 10 Mar 2011 13:02:28 +0100 Subject: Reworked the test case to be more robust. --- mysql-test/suite/perfschema/r/relaylog.result | 147 ++++++++++++++++++-------- 1 file changed, 103 insertions(+), 44 deletions(-) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/relaylog.result b/mysql-test/suite/perfschema/r/relaylog.result index 1ec9f4f4b29..079d1e482b2 100644 --- a/mysql-test/suite/perfschema/r/relaylog.result +++ b/mysql-test/suite/perfschema/r/relaylog.result @@ -9,33 +9,55 @@ Log_name Pos Event_type Server_id End_log_pos Info slave-bin.000001 # Query # # use `test`; create table test.t1(a int) slave-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ "============ Performance schema on master ============" -select * from performance_schema.file_summary_by_instance +select +substring(file_name, locate("master-", file_name)) as FILE_NAME, +EVENT_NAME, +if (count_read > 0, "MANY", "NONE") as COUNT_READ, +if (count_write > 0,"MANY", "NONE") as COUNT_WRITE, +if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ, +if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE +from performance_schema.file_summary_by_instance where file_name like "%master-%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE -[DATADIR]master-bin.000001 wait/io/file/sql/binlog 6 4 221 329 -[DATADIR]master-bin.index wait/io/file/sql/binlog_index 0 2 0 40 +master-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY +master-bin.index wait/io/file/sql/binlog_index NONE MANY NONE MANY select * from performance_schema.file_summary_by_instance where file_name like "%slave-%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE "Expect a master binlog + binlog_index" -select * from performance_schema.file_summary_by_instance +select +substring(file_name, locate("master-", file_name)) as FILE_NAME, +EVENT_NAME, +if (count_read > 0, "MANY", "NONE") as COUNT_READ, +if (count_write > 0,"MANY", "NONE") as COUNT_WRITE, +if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ, +if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE +from performance_schema.file_summary_by_instance where event_name like "%binlog%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE -[DATADIR]master-bin.000001 wait/io/file/sql/binlog 6 4 221 329 -[DATADIR]master-bin.index wait/io/file/sql/binlog_index 0 2 0 40 -select * from performance_schema.file_summary_by_event_name +master-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY +master-bin.index wait/io/file/sql/binlog_index NONE MANY NONE MANY +select +EVENT_NAME, +if (count_read > 0, "MANY", "NONE") as COUNT_READ, +if (count_write > 0,"MANY", "NONE") as COUNT_WRITE, +if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ, +if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE +from performance_schema.file_summary_by_event_name where event_name like "%binlog%" order by event_name; EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE -wait/io/file/sql/binlog 6 4 221 329 -wait/io/file/sql/binlog_index 0 2 0 40 -select event_name, count_star +wait/io/file/sql/binlog MANY MANY MANY MANY +wait/io/file/sql/binlog_index NONE MANY NONE MANY +select +EVENT_NAME, +if (count_star > 0, "MANY", "NONE") as COUNT_STAR from performance_schema.events_waits_summary_global_by_event_name where event_name like "%MYSQL_BIN_LOG%" order by event_name; -event_name count_star -wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids 0 -wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond 1 -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index 3 -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids 0 +EVENT_NAME COUNT_STAR +wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids NONE +wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond MANY +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index MANY +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids NONE "Expect no slave relay log" select * from performance_schema.file_summary_by_instance where event_name like "%relaylog%" order by file_name; @@ -54,49 +76,86 @@ wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index 0 0 0 0 0 select * from performance_schema.file_summary_by_instance where file_name like "%master-%" order by file_name; 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 +substring(file_name, locate("slave-", file_name)) as FILE_NAME, +EVENT_NAME, +if (count_read > 0, "MANY", "NONE") as COUNT_READ, +if (count_write > 0,"MANY", "NONE") as COUNT_WRITE, +if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ, +if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE +from performance_schema.file_summary_by_instance where file_name like "%slave-%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE -[DATADIR]slave-bin.000001 wait/io/file/sql/binlog 3 8 602 631 -[DATADIR]slave-bin.index wait/io/file/sql/binlog_index 0 3 0 57 -[DATADIR]slave-relay-bin.000001 wait/io/file/sql/relaylog 4 3 370 263 -[DATADIR]slave-relay-bin.000002 wait/io/file/sql/relaylog 2 4 368 368 -[DATADIR]slave-relay-bin.index wait/io/file/sql/relaylog_index 2 4 50 125 +slave-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY +slave-bin.index wait/io/file/sql/binlog_index NONE MANY NONE MANY +slave-relay-bin.000001 wait/io/file/sql/relaylog MANY MANY MANY MANY +slave-relay-bin.000002 wait/io/file/sql/relaylog MANY MANY MANY MANY +slave-relay-bin.index wait/io/file/sql/relaylog_index MANY MANY MANY MANY "Expect a slave binlog + binlog_index" -select * from performance_schema.file_summary_by_instance +select +substring(file_name, locate("slave-", file_name)) as FILE_NAME, +EVENT_NAME, +if (count_read > 0, "MANY", "NONE") as COUNT_READ, +if (count_write > 0,"MANY", "NONE") as COUNT_WRITE, +if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ, +if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE +from performance_schema.file_summary_by_instance where event_name like "%binlog%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE -[DATADIR]slave-bin.000001 wait/io/file/sql/binlog 3 8 602 631 -[DATADIR]slave-bin.index wait/io/file/sql/binlog_index 0 3 0 57 -select * from performance_schema.file_summary_by_event_name +slave-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY +slave-bin.index wait/io/file/sql/binlog_index NONE MANY NONE MANY +select +EVENT_NAME, +if (count_read > 0, "MANY", "NONE") as COUNT_READ, +if (count_write > 0,"MANY", "NONE") as COUNT_WRITE, +if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ, +if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE +from performance_schema.file_summary_by_event_name where event_name like "%binlog%" order by event_name; EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE -wait/io/file/sql/binlog 3 8 602 631 -wait/io/file/sql/binlog_index 0 3 0 57 -select event_name, count_star +wait/io/file/sql/binlog MANY MANY MANY MANY +wait/io/file/sql/binlog_index NONE MANY NONE MANY +select +EVENT_NAME, +if (count_star > 0, "MANY", "NONE") as COUNT_STAR from performance_schema.events_waits_summary_global_by_event_name where event_name like "%MYSQL_BIN_LOG%" order by event_name; -event_name count_star -wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids 0 -wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond 0 -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index 5 -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids 0 +EVENT_NAME COUNT_STAR +wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids NONE +wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond NONE +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index MANY +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids NONE "Expect a slave relay log" -select * from performance_schema.file_summary_by_instance +select +substring(file_name, locate("slave-", file_name)) as FILE_NAME, +EVENT_NAME, +if (count_read > 0, "MANY", "NONE") as COUNT_READ, +if (count_write > 0,"MANY", "NONE") as COUNT_WRITE, +if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ, +if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE +from performance_schema.file_summary_by_instance where event_name like "%relaylog%" order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE -[DATADIR]slave-relay-bin.000001 wait/io/file/sql/relaylog 4 3 370 263 -[DATADIR]slave-relay-bin.000002 wait/io/file/sql/relaylog 2 4 368 368 -[DATADIR]slave-relay-bin.index wait/io/file/sql/relaylog_index 2 4 50 125 -select * from performance_schema.file_summary_by_event_name +slave-relay-bin.000001 wait/io/file/sql/relaylog MANY MANY MANY MANY +slave-relay-bin.000002 wait/io/file/sql/relaylog MANY MANY MANY MANY +slave-relay-bin.index wait/io/file/sql/relaylog_index MANY MANY MANY MANY +select +EVENT_NAME, +if (count_read > 0, "MANY", "NONE") as COUNT_READ, +if (count_write > 0,"MANY", "NONE") as COUNT_WRITE, +if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ, +if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE +from performance_schema.file_summary_by_event_name where event_name like "%relaylog%" order by event_name; EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE -wait/io/file/sql/relaylog 6 7 738 631 -wait/io/file/sql/relaylog_index 2 4 50 125 -select event_name, count_star +wait/io/file/sql/relaylog MANY MANY MANY MANY +wait/io/file/sql/relaylog_index MANY MANY MANY MANY +select +EVENT_NAME, +if (count_star > 0, "MANY", "NONE") as COUNT_STAR from performance_schema.events_waits_summary_global_by_event_name where event_name like "%MYSQL_RELAY_LOG%" order by event_name; -event_name count_star -wait/synch/cond/sql/MYSQL_RELAY_LOG::update_cond 2 -wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index 12 +EVENT_NAME COUNT_STAR +wait/synch/cond/sql/MYSQL_RELAY_LOG::update_cond MANY +wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index MANY include/stop_slave.inc -- cgit v1.2.1 From 258e3bfc3077a328c23d3e7b5c024dcefa431c87 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Fri, 11 Mar 2011 11:45:16 +0100 Subject: Test cleanup --- mysql-test/suite/perfschema/r/relaylog.result | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'mysql-test/suite/perfschema/r') diff --git a/mysql-test/suite/perfschema/r/relaylog.result b/mysql-test/suite/perfschema/r/relaylog.result index 079d1e482b2..e2f8270b1f0 100644 --- a/mysql-test/suite/perfschema/r/relaylog.result +++ b/mysql-test/suite/perfschema/r/relaylog.result @@ -84,7 +84,11 @@ if (count_write > 0,"MANY", "NONE") as COUNT_WRITE, if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ, if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE from performance_schema.file_summary_by_instance -where file_name like "%slave-%" order by file_name; +where file_name like "%slave-%" + and (file_name not like "%slave-relay-bin.0%" + or file_name like "%slave-relay-bin.000001" + or file_name like "%slave-relay-bin.000002") +order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE slave-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY slave-bin.index wait/io/file/sql/binlog_index NONE MANY NONE MANY @@ -134,7 +138,11 @@ if (count_write > 0,"MANY", "NONE") as COUNT_WRITE, if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ, if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE from performance_schema.file_summary_by_instance -where event_name like "%relaylog%" order by file_name; +where event_name like "%relaylog%" + and (file_name not like "%slave-relay-bin.0%" + or file_name like "%slave-relay-bin.000001" + or file_name like "%slave-relay-bin.000002") +order by file_name; FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE slave-relay-bin.000001 wait/io/file/sql/relaylog MANY MANY MANY MANY slave-relay-bin.000002 wait/io/file/sql/relaylog MANY MANY MANY MANY -- cgit v1.2.1