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