#At file:///Users/malff/BZR_TREE/mysql-trunk-wl4816/ based on revid:marc.alff@stripped
3207 Marc Alff 2010-11-15
Merge cleanup
modified:
mysql-test/suite/perfschema/r/ddl_os_global_by_type.result
mysql-test/suite/perfschema/r/ddl_setup_objects.result
mysql-test/suite/perfschema/r/dml_os_global_by_type.result
mysql-test/suite/perfschema/r/dml_setup_objects.result
mysql-test/suite/perfschema/r/setup_objects.result
mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
mysql-test/suite/perfschema/t/ddl_os_global_by_type.test
mysql-test/suite/perfschema/t/ddl_setup_objects.test
mysql-test/suite/perfschema/t/dml_os_global_by_type.test
mysql-test/suite/perfschema/t/dml_setup_objects.test
mysql-test/suite/perfschema/t/setup_objects.test
mysql-test/suite/perfschema/t/start_server_no_setup_objects.test
=== modified file 'mysql-test/suite/perfschema/r/ddl_os_global_by_type.result'
--- a/mysql-test/suite/perfschema/r/ddl_os_global_by_type.result 2010-09-24 18:21:22 +0000
+++ b/mysql-test/suite/perfschema/r/ddl_os_global_by_type.result 2010-11-15 15:04:34 +0000
@@ -1,10 +1,10 @@
-alter table performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+alter table performance_schema.objects_summary_global_by_type
add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
-truncate table performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE;
-ALTER TABLE performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+truncate table performance_schema.objects_summary_global_by_type;
+ALTER TABLE performance_schema.objects_summary_global_by_type
ADD INDEX test_index(OBJECT_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index
-ON performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE(OBJECT_NAME);
+ON performance_schema.objects_summary_global_by_type(OBJECT_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
=== modified file 'mysql-test/suite/perfschema/r/ddl_setup_objects.result'
--- a/mysql-test/suite/perfschema/r/ddl_setup_objects.result 2010-09-24 18:21:22 +0000
+++ b/mysql-test/suite/perfschema/r/ddl_setup_objects.result 2010-11-15 15:04:34 +0000
@@ -1,16 +1,16 @@
-alter table performance_schema.SETUP_OBJECTS add column foo integer;
+alter table performance_schema.setup_objects add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
-drop table if exists test.SETUP_OBJECTS;
+drop table if exists test.setup_objects;
create table test.SETUP_OBJECTS as
-select * from performance_schema.SETUP_OBJECTS;
-truncate table performance_schema.SETUP_OBJECTS;
-select count(*) from performance_schema.SETUP_OBJECTS;
+select * from performance_schema.setup_objects;
+truncate table performance_schema.setup_objects;
+select count(*) from performance_schema.setup_objects;
count(*)
0
-insert into performance_schema.SETUP_OBJECTS
-select * from test.SETUP_OBJECTS;
-drop table test.SETUP_OBJECTS;
-ALTER TABLE performance_schema.SETUP_OBJECTS ADD INDEX test_index(OBJECT_NAME);
+insert into performance_schema.setup_objects
+select * from test.setup_objects;
+drop table test.setup_objects;
+ALTER TABLE performance_schema.setup_objects ADD INDEX test_index(OBJECT_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
-CREATE UNIQUE INDEX test_index ON performance_schema.SETUP_OBJECTS(OBJECT_NAME);
+CREATE UNIQUE INDEX test_index ON performance_schema.setup_objects(OBJECT_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
=== modified file 'mysql-test/suite/perfschema/r/dml_os_global_by_type.result'
--- a/mysql-test/suite/perfschema/r/dml_os_global_by_type.result 2010-09-24 18:21:22 +0000
+++ b/mysql-test/suite/perfschema/r/dml_os_global_by_type.result 2010-11-15 15:04:34 +0000
@@ -1,45 +1,45 @@
-select * from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+select * from performance_schema.objects_summary_global_by_type
where object_schema = 'performance_schema' limit 1;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
# # # # # # # #
-select * from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+select * from performance_schema.objects_summary_global_by_type
where object_schema='FOO';
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
-select * from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+select * from performance_schema.objects_summary_global_by_type
order by count_star limit 1;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
# # # # # # # #
-select * from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+select * from performance_schema.objects_summary_global_by_type
order by count_star desc limit 1;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
# # # # # # # #
-select * from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+select * from performance_schema.objects_summary_global_by_type
where object_type = 'TABLE' order by object_schema, object_name limit 1;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
# # # # # # # #
-select * from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+select * from performance_schema.objects_summary_global_by_type
where object_type = 'TABLE' order by object_schema desc, object_name desc limit 1;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
# # # # # # # #
-insert into performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+insert into performance_schema.objects_summary_global_by_type
set object_type='TABLE', schema_name='FOO', object_name='BAR',
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 'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
-update performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+update performance_schema.objects_summary_global_by_type
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
-update performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+update performance_schema.objects_summary_global_by_type
set count_star=12 where object_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
-delete from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+delete from performance_schema.objects_summary_global_by_type
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
-delete from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
-LOCK TABLES performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+delete from performance_schema.objects_summary_global_by_type;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+LOCK TABLES performance_schema.objects_summary_global_by_type READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
UNLOCK TABLES;
-LOCK TABLES performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
+LOCK TABLES performance_schema.objects_summary_global_by_type WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
UNLOCK TABLES;
=== modified file 'mysql-test/suite/perfschema/r/dml_setup_objects.result'
--- a/mysql-test/suite/perfschema/r/dml_setup_objects.result 2010-09-24 18:21:22 +0000
+++ b/mysql-test/suite/perfschema/r/dml_setup_objects.result 2010-11-15 15:04:34 +0000
@@ -1,67 +1,67 @@
-drop table if exists test.SETUP_OBJECTS;
-create table test.SETUP_OBJECTS as
-select * from performance_schema.SETUP_OBJECTS;
-truncate table performance_schema.SETUP_OBJECTS;
-select * from performance_schema.SETUP_OBJECTS;
+drop table if exists test.setup_objects;
+create table test.setup_objects as
+select * from performance_schema.setup_objects;
+truncate table performance_schema.setup_objects;
+select * from performance_schema.setup_objects;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME TIMED
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
order by object_type, object_schema, object_name;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME TIMED
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
where object_type = 'TABLE'
order by object_type, object_schema, object_name;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME TIMED
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
order by object_type, object_schema, object_name;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME TIMED
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
set object_type='ILLEGAL', object_schema='FOO', object_name='BAR',
timed='YES';
ERROR 23000: Cannot add or update a child row: a foreign key constraint fails ()
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
set object_type='TABLE', object_schema='FOO', object_name='BAR',
timed='YES';
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
set object_type='TABLE', object_schema='FOO', object_name='BAR',
timed='NO';
-ERROR 23000: Can't write; duplicate key in table 'SETUP_OBJECTS'
-delete from performance_schema.SETUP_OBJECTS
+ERROR 23000: Can't write; duplicate key in table 'setup_objects'
+delete from performance_schema.setup_objects
where object_type='TABLE' and object_schema='FOO';
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
order by object_type, object_schema, object_name;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME TIMED
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
set object_type='TABLE', object_schema='FOO', object_name='BAR',
timed='YES';
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
order by object_type, object_schema, object_name;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME TIMED
TABLE FOO BAR YES
-update performance_schema.SETUP_OBJECTS
+update performance_schema.setup_objects
set object_type='ILLEGAL';
ERROR HY000: Invalid performance_schema usage.
-update performance_schema.SETUP_OBJECTS
+update performance_schema.setup_objects
set object_schema='ILLEGAL';
ERROR HY000: Invalid performance_schema usage.
-update performance_schema.SETUP_OBJECTS
+update performance_schema.setup_objects
set object_name='ILLEGAL';
ERROR HY000: Invalid performance_schema usage.
-update performance_schema.SETUP_OBJECTS
+update performance_schema.setup_objects
set timed='NO';
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
order by object_type, object_schema, object_name;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME TIMED
TABLE FOO BAR NO
-update performance_schema.SETUP_OBJECTS
+update performance_schema.setup_objects
set timed='YES';
-delete from performance_schema.SETUP_OBJECTS
+delete from performance_schema.setup_objects
where object_type = 'TABLE';
-delete from performance_schema.SETUP_OBJECTS;
-LOCK TABLES performance_schema.SETUP_OBJECTS READ;
+delete from performance_schema.setup_objects;
+LOCK TABLES performance_schema.setup_objects READ;
UNLOCK TABLES;
-LOCK TABLES performance_schema.SETUP_OBJECTS WRITE;
+LOCK TABLES performance_schema.setup_objects WRITE;
UNLOCK TABLES;
-truncate table performance_schema.SETUP_OBJECTS;
-insert into performance_schema.SETUP_OBJECTS
-select * from test.SETUP_OBJECTS;
-drop table test.SETUP_OBJECTS;
+truncate table performance_schema.setup_objects;
+insert into performance_schema.setup_objects
+select * from test.setup_objects;
+drop table test.setup_objects;
=== modified file 'mysql-test/suite/perfschema/r/setup_objects.result'
--- a/mysql-test/suite/perfschema/r/setup_objects.result 2010-09-24 18:21:22 +0000
+++ b/mysql-test/suite/perfschema/r/setup_objects.result 2010-11-15 15:04:34 +0000
@@ -1,17 +1,17 @@
-drop table if exists test.SETUP_OBJECTS;
-create table test.SETUP_OBJECTS as select * from performance_schema.SETUP_OBJECTS;
-truncate table performance_schema.SETUP_OBJECTS;
-insert into performance_schema.SETUP_OBJECTS
+drop table if exists test.setup_objects;
+create table test.setup_objects as select * from performance_schema.setup_objects;
+truncate table performance_schema.setup_objects;
+insert into performance_schema.setup_objects
values ('TABLE', 'db1', 't1', 'YES');
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
values ('TABLE', 'db1', 't2', 'NO');
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
values ('TABLE', 'db1', '%', 'YES');
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
values ('TABLE', 'db2', 't1', 'YES');
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
values ('TABLE', 'db2', 't2', 'NO');
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME TIMED
TABLE db1 % YES
@@ -62,7 +62,7 @@ create table db3.t2(a int);
select * from db3.t2;
a
select distinct OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA
-from performance_schema.EVENTS_WAITS_HISTORY_LONG
+from performance_schema.events_waits_history_long
where OBJECT_SCHEMA like "db%"
group by OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA
order by OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA;
@@ -75,7 +75,7 @@ TABLE t3 db1
TABLE t4 db1
TABLE t5 db1
select distinct OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA
-from performance_schema.EVENTS_WAITS_HISTORY_LONG
+from performance_schema.events_waits_history_long
where OBJECT_SCHEMA like "db%" and TIMER_END is not NULL
group by OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA
order by OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA;
@@ -85,18 +85,18 @@ TABLE t1 db2
TABLE t3 db1
TABLE t4 db1
TABLE t5 db1
-update performance_schema.SETUP_OBJECTS
+update performance_schema.setup_objects
set timed='YES' where OBJECT_SCHEMA = '%';
create table db3.t3(a int);
select * from db3.t3;
a
-truncate table performance_schema.SETUP_OBJECTS;
-select count(*) from performance_schema.SETUP_OBJECTS;
+truncate table performance_schema.setup_objects;
+select count(*) from performance_schema.setup_objects;
count(*)
0
drop database db1;
drop database db2;
drop database db3;
-truncate table performance_schema.SETUP_OBJECTS;
-insert into performance_schema.SETUP_OBJECTS select * from test.SETUP_OBJECTS;
-drop table test.SETUP_OBJECTS;
+truncate table performance_schema.setup_objects;
+insert into performance_schema.setup_objects select * from test.setup_objects;
+drop table test.setup_objects;
=== modified file 'mysql-test/suite/perfschema/r/start_server_no_setup_objects.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result 2010-11-15 07:40:07 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result 2010-11-15 15:04:34 +0000
@@ -62,6 +62,6 @@ show status like "performance_schema%";
show variables like "performance_schema_setup_objects_size";
Variable_name Value
performance_schema_setup_objects_size 0
-select count(*) from performance_schema.SETUP_OBJECTS;
+select count(*) from performance_schema.setup_objects;
count(*)
0
=== modified file 'mysql-test/suite/perfschema/t/ddl_os_global_by_type.test'
--- a/mysql-test/suite/perfschema/t/ddl_os_global_by_type.test 2010-09-24 18:21:22 +0000
+++ b/mysql-test/suite/perfschema/t/ddl_os_global_by_type.test 2010-11-15 15:04:34 +0000
@@ -19,16 +19,16 @@
--source include/have_perfschema.inc
-- error ER_DBACCESS_DENIED_ERROR
-alter table performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+alter table performance_schema.objects_summary_global_by_type
add column foo integer;
-truncate table performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE;
+truncate table performance_schema.objects_summary_global_by_type;
-- error ER_DBACCESS_DENIED_ERROR
-ALTER TABLE performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+ALTER TABLE performance_schema.objects_summary_global_by_type
ADD INDEX test_index(OBJECT_NAME);
-- error ER_DBACCESS_DENIED_ERROR
CREATE UNIQUE INDEX test_index
- ON performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE(OBJECT_NAME);
+ ON performance_schema.objects_summary_global_by_type(OBJECT_NAME);
=== modified file 'mysql-test/suite/perfschema/t/ddl_setup_objects.test'
--- a/mysql-test/suite/perfschema/t/ddl_setup_objects.test 2010-09-24 18:21:22 +0000
+++ b/mysql-test/suite/perfschema/t/ddl_setup_objects.test 2010-11-15 15:04:34 +0000
@@ -18,28 +18,27 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
---replace_result '\'setup_objects' '\'SETUP_OBJECTS'
-- error ER_DBACCESS_DENIED_ERROR
-alter table performance_schema.SETUP_OBJECTS add column foo integer;
+alter table performance_schema.setup_objects add column foo integer;
--disable_warnings
-drop table if exists test.SETUP_OBJECTS;
+drop table if exists test.setup_objects;
--enable_warnings
create table test.SETUP_OBJECTS as
- select * from performance_schema.SETUP_OBJECTS;
+ select * from performance_schema.setup_objects;
-truncate table performance_schema.SETUP_OBJECTS;
+truncate table performance_schema.setup_objects;
-select count(*) from performance_schema.SETUP_OBJECTS;
+select count(*) from performance_schema.setup_objects;
-insert into performance_schema.SETUP_OBJECTS
- select * from test.SETUP_OBJECTS;
-drop table test.SETUP_OBJECTS;
+insert into performance_schema.setup_objects
+ select * from test.setup_objects;
+drop table test.setup_objects;
-- error ER_DBACCESS_DENIED_ERROR
-ALTER TABLE performance_schema.SETUP_OBJECTS ADD INDEX test_index(OBJECT_NAME);
+ALTER TABLE performance_schema.setup_objects ADD INDEX test_index(OBJECT_NAME);
-- error ER_DBACCESS_DENIED_ERROR
-CREATE UNIQUE INDEX test_index ON performance_schema.SETUP_OBJECTS(OBJECT_NAME);
+CREATE UNIQUE INDEX test_index ON performance_schema.setup_objects(OBJECT_NAME);
=== modified file 'mysql-test/suite/perfschema/t/dml_os_global_by_type.test'
--- a/mysql-test/suite/perfschema/t/dml_os_global_by_type.test 2010-09-24 18:21:22 +0000
+++ b/mysql-test/suite/perfschema/t/dml_os_global_by_type.test 2010-11-15 15:04:34 +0000
@@ -19,61 +19,54 @@
--source include/have_perfschema.inc
--replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 #
-select * from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+select * from performance_schema.objects_summary_global_by_type
where object_schema = 'performance_schema' limit 1;
-select * from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+select * from performance_schema.objects_summary_global_by_type
where object_schema='FOO';
--replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 #
-select * from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+select * from performance_schema.objects_summary_global_by_type
order by count_star limit 1;
--replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 #
-select * from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+select * from performance_schema.objects_summary_global_by_type
order by count_star desc limit 1;
--replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 #
-select * from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+select * from performance_schema.objects_summary_global_by_type
where object_type = 'TABLE' order by object_schema, object_name limit 1;
--replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 #
-select * from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+select * from performance_schema.objects_summary_global_by_type
where object_type = 'TABLE' order by object_schema desc, object_name desc limit 1;
---replace_result '\'objects_summary_global_by_type' '\'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
--error ER_TABLEACCESS_DENIED_ERROR
-insert into performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+insert into performance_schema.objects_summary_global_by_type
set object_type='TABLE', schema_name='FOO', object_name='BAR',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
---replace_result '\'objects_summary_global_by_type' '\'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
--error ER_TABLEACCESS_DENIED_ERROR
-update performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+update performance_schema.objects_summary_global_by_type
set count_star=12;
---replace_result '\'objects_summary_global_by_type' '\'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
--error ER_TABLEACCESS_DENIED_ERROR
-update performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+update performance_schema.objects_summary_global_by_type
set count_star=12 where object_name like "FOO";
---replace_result '\'objects_summary_global_by_type' '\'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
--error ER_TABLEACCESS_DENIED_ERROR
-delete from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE
+delete from performance_schema.objects_summary_global_by_type
where count_star=1;
---replace_result '\'objects_summary_global_by_type' '\'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
--error ER_TABLEACCESS_DENIED_ERROR
-delete from performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE;
+delete from performance_schema.objects_summary_global_by_type;
---replace_result '\'objects_summary_global_by_type' '\'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
-- error ER_TABLEACCESS_DENIED_ERROR
-LOCK TABLES performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE READ;
+LOCK TABLES performance_schema.objects_summary_global_by_type READ;
UNLOCK TABLES;
---replace_result '\'objects_summary_global_by_type' '\'OBJECTS_SUMMARY_GLOBAL_BY_TYPE'
-- error ER_TABLEACCESS_DENIED_ERROR
-LOCK TABLES performance_schema.OBJECTS_SUMMARY_GLOBAL_BY_TYPE WRITE;
+LOCK TABLES performance_schema.objects_summary_global_by_type WRITE;
UNLOCK TABLES;
=== modified file 'mysql-test/suite/perfschema/t/dml_setup_objects.test'
--- a/mysql-test/suite/perfschema/t/dml_setup_objects.test 2010-09-24 18:21:22 +0000
+++ b/mysql-test/suite/perfschema/t/dml_setup_objects.test 2010-11-15 15:04:34 +0000
@@ -19,91 +19,90 @@
--source include/have_perfschema.inc
--disable_warnings
-drop table if exists test.SETUP_OBJECTS;
+drop table if exists test.setup_objects;
--enable_warnings
# Save the setup
-create table test.SETUP_OBJECTS as
- select * from performance_schema.SETUP_OBJECTS;
-truncate table performance_schema.SETUP_OBJECTS;
+create table test.setup_objects as
+ select * from performance_schema.setup_objects;
+truncate table performance_schema.setup_objects;
# Test
-select * from performance_schema.SETUP_OBJECTS;
+select * from performance_schema.setup_objects;
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
order by object_type, object_schema, object_name;
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
where object_type = 'TABLE'
order by object_type, object_schema, object_name;
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
order by object_type, object_schema, object_name;
--error ER_NO_REFERENCED_ROW_2
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
set object_type='ILLEGAL', object_schema='FOO', object_name='BAR',
timed='YES';
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
set object_type='TABLE', object_schema='FOO', object_name='BAR',
timed='YES';
---replace_result '\'setup_objects' '\'SETUP_OBJECTS'
--error ER_DUP_KEY
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
set object_type='TABLE', object_schema='FOO', object_name='BAR',
timed='NO';
-delete from performance_schema.SETUP_OBJECTS
+delete from performance_schema.setup_objects
where object_type='TABLE' and object_schema='FOO';
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
order by object_type, object_schema, object_name;
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
set object_type='TABLE', object_schema='FOO', object_name='BAR',
timed='YES';
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
order by object_type, object_schema, object_name;
--error ER_WRONG_PERFSCHEMA_USAGE
-update performance_schema.SETUP_OBJECTS
+update performance_schema.setup_objects
set object_type='ILLEGAL';
--error ER_WRONG_PERFSCHEMA_USAGE
-update performance_schema.SETUP_OBJECTS
+update performance_schema.setup_objects
set object_schema='ILLEGAL';
--error ER_WRONG_PERFSCHEMA_USAGE
-update performance_schema.SETUP_OBJECTS
+update performance_schema.setup_objects
set object_name='ILLEGAL';
-update performance_schema.SETUP_OBJECTS
+update performance_schema.setup_objects
set timed='NO';
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
order by object_type, object_schema, object_name;
-update performance_schema.SETUP_OBJECTS
+update performance_schema.setup_objects
set timed='YES';
-delete from performance_schema.SETUP_OBJECTS
+delete from performance_schema.setup_objects
where object_type = 'TABLE';
-delete from performance_schema.SETUP_OBJECTS;
+delete from performance_schema.setup_objects;
-LOCK TABLES performance_schema.SETUP_OBJECTS READ;
+LOCK TABLES performance_schema.setup_objects READ;
UNLOCK TABLES;
-LOCK TABLES performance_schema.SETUP_OBJECTS WRITE;
+LOCK TABLES performance_schema.setup_objects WRITE;
UNLOCK TABLES;
# Restore the setup
-truncate table performance_schema.SETUP_OBJECTS;
-insert into performance_schema.SETUP_OBJECTS
- select * from test.SETUP_OBJECTS;
-drop table test.SETUP_OBJECTS;
+truncate table performance_schema.setup_objects;
+insert into performance_schema.setup_objects
+ select * from test.setup_objects;
+drop table test.setup_objects;
=== modified file 'mysql-test/suite/perfschema/t/setup_objects.test'
--- a/mysql-test/suite/perfschema/t/setup_objects.test 2010-09-24 18:21:22 +0000
+++ b/mysql-test/suite/perfschema/t/setup_objects.test 2010-11-15 15:04:34 +0000
@@ -17,29 +17,29 @@
--source include/have_perfschema.inc
--disable_warnings
-drop table if exists test.SETUP_OBJECTS;
+drop table if exists test.setup_objects;
--enable_warnings
# Save the setup
-create table test.SETUP_OBJECTS as select * from performance_schema.SETUP_OBJECTS;
-truncate table performance_schema.SETUP_OBJECTS;
+create table test.setup_objects as select * from performance_schema.setup_objects;
+truncate table performance_schema.setup_objects;
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
values ('TABLE', 'db1', 't1', 'YES');
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
values ('TABLE', 'db1', 't2', 'NO');
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
values ('TABLE', 'db1', '%', 'YES');
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
values ('TABLE', 'db2', 't1', 'YES');
-insert into performance_schema.SETUP_OBJECTS
+insert into performance_schema.setup_objects
values ('TABLE', 'db2', 't2', 'NO');
-select * from performance_schema.SETUP_OBJECTS
+select * from performance_schema.setup_objects
order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
--disable_warnings
@@ -85,34 +85,34 @@ select * from db3.t2;
# Verify what is instrumented
select distinct OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA
- from performance_schema.EVENTS_WAITS_HISTORY_LONG
+ from performance_schema.events_waits_history_long
where OBJECT_SCHEMA like "db%"
group by OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA
order by OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA;
# Verify what is instrumented and timed
select distinct OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA
- from performance_schema.EVENTS_WAITS_HISTORY_LONG
+ from performance_schema.events_waits_history_long
where OBJECT_SCHEMA like "db%" and TIMER_END is not NULL
group by OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA
order by OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA;
-update performance_schema.SETUP_OBJECTS
+update performance_schema.setup_objects
set timed='YES' where OBJECT_SCHEMA = '%';
create table db3.t3(a int);
select * from db3.t3;
-truncate table performance_schema.SETUP_OBJECTS;
+truncate table performance_schema.setup_objects;
-select count(*) from performance_schema.SETUP_OBJECTS;
+select count(*) from performance_schema.setup_objects;
drop database db1;
drop database db2;
drop database db3;
# Restore the setup
-truncate table performance_schema.SETUP_OBJECTS;
-insert into performance_schema.SETUP_OBJECTS select * from test.SETUP_OBJECTS;
-drop table test.SETUP_OBJECTS;
+truncate table performance_schema.setup_objects;
+insert into performance_schema.setup_objects select * from test.setup_objects;
+drop table test.setup_objects;
=== modified file 'mysql-test/suite/perfschema/t/start_server_no_setup_objects.test'
--- a/mysql-test/suite/perfschema/t/start_server_no_setup_objects.test 2010-09-24 18:21:22 +0000
+++ b/mysql-test/suite/perfschema/t/start_server_no_setup_objects.test 2010-11-15 15:04:34 +0000
@@ -24,5 +24,5 @@
show variables like "performance_schema_setup_objects_size";
# Expect no setup_objects
-select count(*) from performance_schema.SETUP_OBJECTS;
+select count(*) from performance_schema.setup_objects;
Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20101115150434-pnp3yxjc24fwgzjz.bundle
| Thread |
|---|
| • bzr commit into mysql-trunk-wl4816 branch (marc.alff:3207) | Marc Alff | 15 Nov |
