From: Marc Alff Date: November 9 2010 5:03am Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3336) Bug#57609 List-Archive: http://lists.mysql.com/commits/123166 X-Bug: 57609 Message-Id: <201011090504.oA91roTb016582@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5681388941012705948==" --===============5681388941012705948== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-merge/ based on revid:marc.alff@stripped 3336 Marc Alff 2010-11-09 Bug#57609 performance_schema does not work with lower_case_table_names Merge to mysql-trunk-bugfixing (5.6), fixed 5.6 specific test cases. modified: mysql-test/suite/perfschema/include/table_io_cleanup_helper.inc mysql-test/suite/perfschema/include/table_io_result_helper.inc mysql-test/suite/perfschema/include/table_io_setup_helper.inc mysql-test/suite/perfschema/r/csv_table_io.result mysql-test/suite/perfschema/r/func_mutex.result mysql-test/suite/perfschema/r/indexed_table_io.result mysql-test/suite/perfschema/r/innodb_table_io.result mysql-test/suite/perfschema/r/memory_table_io.result mysql-test/suite/perfschema/r/merge_table_io.result mysql-test/suite/perfschema/r/multi_table_io.result mysql-test/suite/perfschema/r/myisam_table_io.result mysql-test/suite/perfschema/r/no_threads.result mysql-test/suite/perfschema/r/part_table_io.result mysql-test/suite/perfschema/r/privilege_table_io.result mysql-test/suite/perfschema/r/rollback_table_io.result mysql-test/suite/perfschema/r/selects.result mysql-test/suite/perfschema/r/temp_table_io.result mysql-test/suite/perfschema/r/trigger_table_io.result mysql-test/suite/perfschema/r/view_table_io.result mysql-test/suite/perfschema/t/csv_table_io.test mysql-test/suite/perfschema/t/disabled.def mysql-test/suite/perfschema/t/func_mutex.test mysql-test/suite/perfschema/t/indexed_table_io.test mysql-test/suite/perfschema/t/innodb_table_io.test mysql-test/suite/perfschema/t/memory_table_io.test mysql-test/suite/perfschema/t/merge_table_io.test mysql-test/suite/perfschema/t/multi_table_io.test mysql-test/suite/perfschema/t/myisam_table_io.test mysql-test/suite/perfschema/t/no_threads.test mysql-test/suite/perfschema/t/part_table_io.test mysql-test/suite/perfschema/t/privilege_table_io.test mysql-test/suite/perfschema/t/rollback_table_io.test mysql-test/suite/perfschema/t/selects.test mysql-test/suite/perfschema/t/temp_table_io.test mysql-test/suite/perfschema/t/trigger_table_io.test mysql-test/suite/perfschema/t/view_table_io.test === modified file 'mysql-test/suite/perfschema/include/table_io_cleanup_helper.inc' --- a/mysql-test/suite/perfschema/include/table_io_cleanup_helper.inc 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/include/table_io_cleanup_helper.inc 2010-11-09 05:02:46 +0000 @@ -16,10 +16,10 @@ # See related script table_io_setup_helper.inc # Cleanup -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/include/table_io_result_helper.inc' --- a/mysql-test/suite/perfschema/include/table_io_result_helper.inc 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/include/table_io_result_helper.inc 2010-11-09 05:02:46 +0000 @@ -16,14 +16,14 @@ # See related script table_io_setup_helper.inc # Stop table io recording -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; eval select event_name, left(source, locate(":", source)) as short_source, object_type, object_schema, if (locate("#sql-", object_name), "#sql-XXXX", object_name) as pretty_name, operation, number_of_bytes - from performance_schema.EVENTS_WAITS_HISTORY_LONG + from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema in ($schema_to_dump) order by thread_id, event_id; @@ -32,6 +32,6 @@ eval select event_name, show status like 'performance_schema_%'; # Cleanup -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate performance_schema.events_waits_history_long; flush status; === modified file 'mysql-test/suite/perfschema/include/table_io_setup_helper.inc' --- a/mysql-test/suite/perfschema/include/table_io_setup_helper.inc 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/include/table_io_setup_helper.inc 2010-11-09 05:02:46 +0000 @@ -24,7 +24,7 @@ # --source include/have_perfschema.inc # --source ../include/table_io_setup_helper.inc # ... more setup scripts as needed ... -# update performance_schema.SETUP_CONSUMERS set enabled='YES'; +# update performance_schema.setup_consumers set enabled='YES'; # ... test payload here ... # ... optionally, add this insert between statements # ... to make the final output more readable @@ -34,7 +34,7 @@ # let $schema_to_dump="db1", "db2", "db3"; # --source ../include/table_io_result_helper.inc # Optional: Repeat several times -# update performance_schema.SETUP_CONSUMERS set enabled='YES'; +# update performance_schema.setup_consumers set enabled='YES'; # ... test payload here ... # --source ../include/table_io_result_helper.inc # ... cleanup @@ -53,13 +53,13 @@ drop table if exists test.marker; # to separate table io events between statements. create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; -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/table/%"; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_history_long; # Reset lost counters to a known state flush status; === modified file 'mysql-test/suite/perfschema/r/csv_table_io.result' --- a/mysql-test/suite/perfschema/r/csv_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/csv_table_io.result 2010-11-09 05:02:46 +0000 @@ -1,13 +1,13 @@ drop table if exists test.marker; create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_consumers set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; -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; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; create table test.no_index_tab ( a varchar(255) not null, b int not null) engine = CSV; @@ -57,14 +57,14 @@ insert into marker set a = 1; truncate table test.no_index_tab; insert into marker set a = 1; drop table test.no_index_tab; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select event_name, left(source, locate(":", source)) as short_source, object_type, object_schema, if (locate("#sql-", object_name), "#sql-XXXX", object_name) as pretty_name, operation, number_of_bytes -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema in ("test") order by thread_id, event_id; @@ -126,11 +126,11 @@ Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate performance_schema.events_waits_history_long; flush status; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/r/func_mutex.result' --- a/mysql-test/suite/perfschema/r/func_mutex.result 2010-11-08 19:35:17 +0000 +++ b/mysql-test/suite/perfschema/r/func_mutex.result 2010-11-09 05:02:46 +0000 @@ -111,4 +111,4 @@ SELECT IF((COALESCE(@after_count, 0) - C test_fm2_rw_timed Success DROP TABLE t1; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES'; +UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; === modified file 'mysql-test/suite/perfschema/r/indexed_table_io.result' --- a/mysql-test/suite/perfschema/r/indexed_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/indexed_table_io.result 2010-11-09 05:02:46 +0000 @@ -2,11 +2,11 @@ drop table if exists test.no_index_tab; drop table if exists test.index_tab; drop table if exists test.marker; create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_consumers set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_history_long; flush status; create table test.no_index_tab ( a int, b char(30) default 'Default') engine = MyISAM; @@ -25,19 +25,19 @@ index_tab CREATE TABLE `index_tab` ( `b` char(30) DEFAULT 'Default', UNIQUE KEY `uidx` (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; # Printing of 100 inserts per table is suppressed -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select COUNT(*) -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema = 'test' and object_name = 'no_index_tab'; COUNT(*) 100 select COUNT(*) -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema = 'test' and object_name = 'index_tab'; @@ -49,75 +49,75 @@ count(*) select count(*) from test.index_tab; count(*) 100 -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; select avg(a) from test.no_index_tab; avg(a) 50.5000 -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select COUNT(*) -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema = 'test' and object_name = 'no_index_tab'; COUNT(*) 101 -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; select avg(a) from test.index_tab; avg(a) 50.5000 -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select COUNT(*) -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema = 'test' and object_name = 'index_tab'; COUNT(*) 101 -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; select 1 as my_column from test.no_index_tab where a = 50; my_column 1 -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select COUNT(*) -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema = 'test' and object_name = 'no_index_tab'; COUNT(*) 101 -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; select 1 as my_column from test.index_tab where a = 50; my_column 1 -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select COUNT(*) -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema = 'test' and object_name = 'index_tab'; COUNT(*) 1 -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; delete from test.no_index_tab where a = 51; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select COUNT(*) -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema = 'test' and object_name = 'no_index_tab'; COUNT(*) 102 -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; delete from test.index_tab where a = 51; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select COUNT(*) -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema = 'test' and object_name = 'index_tab'; @@ -141,9 +141,9 @@ Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 drop table test.no_index_tab; drop table test.index_tab; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/r/innodb_table_io.result' --- a/mysql-test/suite/perfschema/r/innodb_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/innodb_table_io.result 2010-11-09 05:02:46 +0000 @@ -1,13 +1,13 @@ drop table if exists test.marker; create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_consumers set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; -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; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; create table test.no_index_tab ( a varchar(255) not null, b int not null) engine = InnoDB; @@ -58,14 +58,14 @@ insert into marker set a = 1; truncate table test.no_index_tab; insert into marker set a = 1; drop table test.no_index_tab; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select event_name, left(source, locate(":", source)) as short_source, object_type, object_schema, if (locate("#sql-", object_name), "#sql-XXXX", object_name) as pretty_name, operation, number_of_bytes -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema in ("test") order by thread_id, event_id; @@ -132,11 +132,11 @@ Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate performance_schema.events_waits_history_long; flush status; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/r/memory_table_io.result' --- a/mysql-test/suite/perfschema/r/memory_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/memory_table_io.result 2010-11-09 05:02:46 +0000 @@ -1,13 +1,13 @@ drop table if exists test.marker; create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_consumers set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; -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; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; create table test.no_index_tab ( a varchar(255) not null, b int not null) engine = MEMORY; @@ -57,14 +57,14 @@ insert into marker set a = 1; truncate table test.no_index_tab; insert into marker set a = 1; drop table test.no_index_tab; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select event_name, left(source, locate(":", source)) as short_source, object_type, object_schema, if (locate("#sql-", object_name), "#sql-XXXX", object_name) as pretty_name, operation, number_of_bytes -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema in ("test") order by thread_id, event_id; @@ -128,11 +128,11 @@ Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate performance_schema.events_waits_history_long; flush status; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/r/merge_table_io.result' --- a/mysql-test/suite/perfschema/r/merge_table_io.result 2010-10-07 12:47:15 +0000 +++ b/mysql-test/suite/perfschema/r/merge_table_io.result 2010-11-09 05:02:46 +0000 @@ -1,15 +1,15 @@ drop table if exists test.marker; create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_consumers set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; -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; drop table if exists test.no_index_tab_1; drop table if exists test.no_index_tab_2; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; create table test.no_index_tab_1 ( a varchar(255) not null, b int not null) engine = MyISAM; @@ -83,14 +83,14 @@ insert into marker set a = 1; drop table test.no_index_tab_2; insert into marker set a = 1; drop table test.no_index_tab; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select event_name, left(source, locate(":", source)) as short_source, object_type, object_schema, if (locate("#sql-", object_name), "#sql-XXXX", object_name) as pretty_name, operation, number_of_bytes -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema in ("test") order by thread_id, event_id; @@ -158,11 +158,11 @@ Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate performance_schema.events_waits_history_long; flush status; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/r/multi_table_io.result' --- a/mysql-test/suite/perfschema/r/multi_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/multi_table_io.result 2010-11-09 05:02:46 +0000 @@ -18,13 +18,13 @@ t2 CREATE TABLE `t2` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table if exists test.marker; create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_consumers set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_history_long; flush status; -update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; +update performance_schema.setup_consumers set enabled = 'YES'; insert into test1.t2 select * from test.t1; insert into marker set a = 1; select * from test.t1 natural join test1.t2; @@ -39,14 +39,14 @@ update test.t1 AS a natural join test1.t insert into marker set a = 1; delete from test.t1, test1.t2 using test.t1 inner join test1.t2 where test.t1.col1 = test1.t2.col1; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select event_name, left(source, locate(":", source)) as short_source, object_type, object_schema, if (locate("#sql-", object_name), "#sql-XXXX", object_name) as pretty_name, operation, number_of_bytes -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema in ('test','test1') order by thread_id, event_id; @@ -87,13 +87,13 @@ Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate performance_schema.events_waits_history_long; flush status; drop table test.t1; drop schema test1; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/r/myisam_table_io.result' --- a/mysql-test/suite/perfschema/r/myisam_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/myisam_table_io.result 2010-11-09 05:02:46 +0000 @@ -1,13 +1,13 @@ drop table if exists test.marker; create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_consumers set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; -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; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; create table test.no_index_tab ( a varchar(255) not null, b int not null) engine = MyISAM; @@ -57,14 +57,14 @@ insert into marker set a = 1; truncate table test.no_index_tab; insert into marker set a = 1; drop table test.no_index_tab; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select event_name, left(source, locate(":", source)) as short_source, object_type, object_schema, if (locate("#sql-", object_name), "#sql-XXXX", object_name) as pretty_name, operation, number_of_bytes -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema in ("test") order by thread_id, event_id; @@ -126,11 +126,11 @@ Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate performance_schema.events_waits_history_long; flush status; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/r/no_threads.result' --- a/mysql-test/suite/perfschema/r/no_threads.result 2010-11-08 19:35:17 +0000 +++ b/mysql-test/suite/perfschema/r/no_threads.result 2010-11-09 05:02:46 +0000 @@ -40,5 +40,5 @@ left(source, locate(":", source)) as sho from performance_schema.events_waits_history_long; event_name operation short_source wait/synch/mutex/mysys/THR_LOCK_myisam lock mi_create.c: -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; drop table test.t1; === modified file 'mysql-test/suite/perfschema/r/part_table_io.result' --- a/mysql-test/suite/perfschema/r/part_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/part_table_io.result 2010-11-09 05:02:46 +0000 @@ -1,13 +1,13 @@ drop table if exists test.marker; create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_consumers set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; -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; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; create table test.no_index_tab ( a varchar(255) not null, b int not null) engine = MyISAM @@ -60,14 +60,14 @@ insert into marker set a = 1; truncate table test.no_index_tab; insert into marker set a = 1; drop table test.no_index_tab; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select event_name, left(source, locate(":", source)) as short_source, object_type, object_schema, if (locate("#sql-", object_name), "#sql-XXXX", object_name) as pretty_name, operation, number_of_bytes -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema in ("test") order by thread_id, event_id; @@ -158,11 +158,11 @@ Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate performance_schema.events_waits_history_long; flush status; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/r/privilege_table_io.result' --- a/mysql-test/suite/perfschema/r/privilege_table_io.result 2010-11-05 14:36:16 +0000 +++ b/mysql-test/suite/perfschema/r/privilege_table_io.result 2010-11-09 05:02:46 +0000 @@ -1,26 +1,26 @@ drop table if exists test.marker; create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_consumers set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_history_long; flush status; # We are forced to suppress here the server response. optimize table mysql.db; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; flush privileges; insert into test.marker set a = 1; insert into test.marker set a = 1; insert into test.marker set a = 1; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select event_name, left(source, locate(":", source)) as short_source, object_type, object_schema, if (locate("#sql-", object_name), "#sql-XXXX", object_name) as pretty_name, operation, number_of_bytes -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema in ("test", "mysql") order by thread_id, event_id; @@ -59,11 +59,11 @@ Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate performance_schema.events_waits_history_long; flush status; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/r/rollback_table_io.result' --- a/mysql-test/suite/perfschema/r/rollback_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/rollback_table_io.result 2010-11-09 05:02:46 +0000 @@ -9,13 +9,13 @@ t1 CREATE TABLE `t1` ( insert into test.t1 values(1,'One'); drop table if exists test.marker; create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_consumers set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_history_long; flush status; -update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; +update performance_schema.setup_consumers set enabled = 'YES'; set autocommit = off; delete from test.t1 where col1 = 1; insert into marker set a = 1; @@ -28,14 +28,14 @@ insert into marker set a = 1; insert into test.t1 values(2,'Two'); insert into marker set a = 1; rollback; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select event_name, left(source, locate(":", source)) as short_source, object_type, object_schema, if (locate("#sql-", object_name), "#sql-XXXX", object_name) as pretty_name, operation, number_of_bytes -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema in ('test') order by thread_id, event_id; @@ -68,12 +68,12 @@ Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate performance_schema.events_waits_history_long; flush status; drop table test.t1; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/r/selects.result' --- a/mysql-test/suite/perfschema/r/selects.result 2010-11-08 19:35:17 +0000 +++ b/mysql-test/suite/perfschema/r/selects.result 2010-11-09 05:02:46 +0000 @@ -110,4 +110,4 @@ DROP PROCEDURE t_ps_proc; DROP FUNCTION t_ps_func; DROP TABLE t1; DROP TABLE t_event; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES'; +UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; === modified file 'mysql-test/suite/perfschema/r/temp_table_io.result' --- a/mysql-test/suite/perfschema/r/temp_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/temp_table_io.result 2010-11-09 05:02:46 +0000 @@ -1,13 +1,13 @@ drop table if exists test.marker; create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_consumers set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_history_long; flush status; drop temporary table if exists test.no_index_tab; -update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; +update performance_schema.setup_consumers set enabled = 'YES'; insert into marker set a = 1; create temporary table test.no_index_tab ( a varchar(255) not null, b int not null) engine = MyISAM; @@ -57,14 +57,14 @@ insert into marker set a = 1; truncate table test.no_index_tab; insert into marker set a = 1; drop temporary table test.no_index_tab; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select event_name, left(source, locate(":", source)) as short_source, object_type, object_schema, if (locate("#sql-", object_name), "#sql-XXXX", object_name) as pretty_name, operation, number_of_bytes -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema in ("test") order by thread_id, event_id; @@ -126,11 +126,11 @@ Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate performance_schema.events_waits_history_long; flush status; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/r/trigger_table_io.result' --- a/mysql-test/suite/perfschema/r/trigger_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/trigger_table_io.result 2010-11-09 05:02:46 +0000 @@ -1,10 +1,10 @@ drop table if exists test.marker; create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_consumers set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_history_long; flush status; drop table if exists test.t1; drop table if exists test.t2; @@ -22,7 +22,7 @@ create trigger t1_bd before delete on t1 for each row delete from test.t2 where b = old.a; create trigger t1_ad after delete on t1 for each row insert into test.t2 set b = old.a, v = 99; -update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; +update performance_schema.setup_consumers set enabled = 'YES'; insert into marker set a = 1; insert into t1 set a = 1, v = 10; insert into marker set a = 1; @@ -70,14 +70,14 @@ select * from t2; b v 1 99 2 99 -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select event_name, left(source, locate(":", source)) as short_source, object_type, object_schema, if (locate("#sql-", object_name), "#sql-XXXX", object_name) as pretty_name, operation, number_of_bytes -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema in ("test") order by thread_id, event_id; @@ -184,13 +184,13 @@ Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate performance_schema.events_waits_history_long; flush status; drop table test.t1; drop table test.t2; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/r/view_table_io.result' --- a/mysql-test/suite/perfschema/r/view_table_io.result 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/r/view_table_io.result 2010-11-09 05:02:46 +0000 @@ -1,14 +1,14 @@ drop table if exists test.marker; create table test.marker(a int); -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES' +update performance_schema.setup_consumers set enabled='NO'; +update performance_schema.setup_instruments set enabled='NO'; +update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate table performance_schema.events_waits_history_long; flush status; drop view if exists test.v1; drop table if exists test.no_index_tab; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; create table test.no_index_tab ( a varchar(255) not null, b int not null) engine = MyISAM; @@ -64,14 +64,14 @@ insert into marker set a = 1; drop view test.v1; insert into marker set a = 1; drop table test.no_index_tab; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; select event_name, left(source, locate(":", source)) as short_source, object_type, object_schema, if (locate("#sql-", object_name), "#sql-XXXX", object_name) as pretty_name, operation, number_of_bytes -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema in ("test") order by thread_id, event_id; @@ -135,11 +135,11 @@ Performance_schema_table_handles_lost 0 Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +truncate performance_schema.events_waits_history_long; flush status; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; -truncate performance_schema.EVENTS_WAITS_HISTORY_LONG; +update performance_schema.setup_consumers set enabled='NO'; +truncate performance_schema.events_waits_history_long; drop table test.marker; flush status; -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; === modified file 'mysql-test/suite/perfschema/t/csv_table_io.test' --- a/mysql-test/suite/perfschema/t/csv_table_io.test 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/t/csv_table_io.test 2010-11-09 05:02:46 +0000 @@ -26,7 +26,7 @@ eval drop table if exists $table_item; --enable_warnings # Start recording events -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; eval create table $table_item ( a varchar(255) not null, b int not null) engine = $engine_type; === modified file 'mysql-test/suite/perfschema/t/disabled.def' --- a/mysql-test/suite/perfschema/t/disabled.def 2010-08-24 13:46:06 +0000 +++ b/mysql-test/suite/perfschema/t/disabled.def 2010-11-09 05:02:46 +0000 @@ -25,5 +25,3 @@ # ############################################################################## -start_server_on : BUG#55576 2010-08-19 Vasil Dimov disabled until the bug is resolved -server_init : BUG#55576 2010-08-19 Vasil Dimov disabled until the bug is resolved === modified file 'mysql-test/suite/perfschema/t/func_mutex.test' --- a/mysql-test/suite/perfschema/t/func_mutex.test 2010-11-08 19:35:17 +0000 +++ b/mysql-test/suite/perfschema/t/func_mutex.test 2010-11-09 05:02:46 +0000 @@ -130,5 +130,5 @@ SELECT IF((COALESCE(@after_count, 0) - C DROP TABLE t1; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES'; +UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; === modified file 'mysql-test/suite/perfschema/t/indexed_table_io.test' --- a/mysql-test/suite/perfschema/t/indexed_table_io.test 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/t/indexed_table_io.test 2010-11-09 05:02:46 +0000 @@ -29,7 +29,7 @@ drop table if exists test.index_tab; --enable_warnings let $table_io_select= select COUNT(*) -from performance_schema.EVENTS_WAITS_HISTORY_LONG +from performance_schema.events_waits_history_long where event_name like 'wait/io/table/%' and object_schema = 'test' and object_name = ; @@ -46,8 +46,8 @@ eval create table test.index_tab show create table test.no_index_tab; show create table test.index_tab; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; --echo # Printing of 100 inserts per table is suppressed --disable_query_log let $run= 100; @@ -58,7 +58,7 @@ while ($run) dec $run; } --enable_query_log -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; eval $table_io_select 'no_index_tab'; # Attention: There is no visible impact of index maintenance on table io # because the maintenance is handled by the storage engine themself. @@ -74,15 +74,15 @@ select count(*) from test.index_tab; # - all unique index values (test.index_tab, assuming the optimizer decides to # process only the unique index) # --> No difference between numvber of accesses for no_index_tab and index_tab -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; select avg(a) from test.no_index_tab; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; eval $table_io_select 'no_index_tab'; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; select avg(a) from test.index_tab; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; eval $table_io_select 'index_tab'; # With where a = 50 inspection of @@ -90,15 +90,15 @@ eval $table_io_select 'index_tab'; # - 1 up to maybe a few unique index values (test.index_tab, assuming that the # optimizer decides to exploit the unique index) # --> index_tab requires much less accesses than no_index_tab -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; select 1 as my_column from test.no_index_tab where a = 50; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; eval $table_io_select 'no_index_tab'; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; select 1 as my_column from test.index_tab where a = 50; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; eval $table_io_select 'index_tab'; # With where a = 50 inspection of @@ -107,15 +107,15 @@ eval $table_io_select 'index_tab'; # optimizer decides to exploit the unique index) # and remove one row for both cases # --> index_tab requires much less accesses than no_index_tab -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; delete from test.no_index_tab where a = 51; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; eval $table_io_select 'no_index_tab'; -truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +truncate table performance_schema.events_waits_history_long; +update performance_schema.setup_consumers set enabled='YES'; delete from test.index_tab where a = 51; -update performance_schema.SETUP_CONSUMERS set enabled='NO'; +update performance_schema.setup_consumers set enabled='NO'; eval $table_io_select 'index_tab'; # In case of failures, this will tell if table io are lost. === modified file 'mysql-test/suite/perfschema/t/innodb_table_io.test' --- a/mysql-test/suite/perfschema/t/innodb_table_io.test 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/t/innodb_table_io.test 2010-11-09 05:02:46 +0000 @@ -26,7 +26,7 @@ eval drop table if exists $table_item; --enable_warnings # Start recording events -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; eval create table $table_item ( a varchar(255) not null, b int not null) engine = $engine_type; === modified file 'mysql-test/suite/perfschema/t/memory_table_io.test' --- a/mysql-test/suite/perfschema/t/memory_table_io.test 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/t/memory_table_io.test 2010-11-09 05:02:46 +0000 @@ -26,7 +26,7 @@ eval drop table if exists $table_item; --enable_warnings # Start recording events -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; eval create table $table_item ( a varchar(255) not null, b int not null) engine = $engine_type; === modified file 'mysql-test/suite/perfschema/t/merge_table_io.test' --- a/mysql-test/suite/perfschema/t/merge_table_io.test 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/t/merge_table_io.test 2010-11-09 05:02:46 +0000 @@ -29,7 +29,7 @@ drop table if exists test.no_index_tab_2 --enable_warnings # Start recording events -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; eval create table test.no_index_tab_1 ( a varchar(255) not null, b int not null) engine = $engine_type; === modified file 'mysql-test/suite/perfschema/t/multi_table_io.test' --- a/mysql-test/suite/perfschema/t/multi_table_io.test 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/t/multi_table_io.test 2010-11-09 05:02:46 +0000 @@ -40,7 +40,7 @@ show create table test1.t2; let $schema_to_dump= 'test','test1'; # Start event recording -update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; +update performance_schema.setup_consumers set enabled = 'YES'; # INSERT ... SELECT ... insert into test1.t2 select * from test.t1; === modified file 'mysql-test/suite/perfschema/t/myisam_table_io.test' --- a/mysql-test/suite/perfschema/t/myisam_table_io.test 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/t/myisam_table_io.test 2010-11-09 05:02:46 +0000 @@ -26,7 +26,7 @@ eval drop table if exists $table_item; --enable_warnings # Start recording events -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; eval create table $table_item ( a varchar(255) not null, b int not null) engine = $engine_type; === modified file 'mysql-test/suite/perfschema/t/no_threads.test' --- a/mysql-test/suite/perfschema/t/no_threads.test 2010-11-08 19:35:17 +0000 +++ b/mysql-test/suite/perfschema/t/no_threads.test 2010-11-09 05:02:46 +0000 @@ -65,7 +65,7 @@ select event_name, operation, # Cleanup -update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; +update performance_schema.setup_instruments set enabled='YES'; drop table test.t1; === modified file 'mysql-test/suite/perfschema/t/part_table_io.test' --- a/mysql-test/suite/perfschema/t/part_table_io.test 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/t/part_table_io.test 2010-11-09 05:02:46 +0000 @@ -26,7 +26,7 @@ eval drop table if exists $table_item; --enable_warnings # Start recording events -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; eval create table $table_item ( a varchar(255) not null, b int not null) engine = $engine_type === modified file 'mysql-test/suite/perfschema/t/privilege_table_io.test' --- a/mysql-test/suite/perfschema/t/privilege_table_io.test 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/t/privilege_table_io.test 2010-11-09 05:02:46 +0000 @@ -33,7 +33,7 @@ optimize table mysql.db; --enable_result_log # Start recording events -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; # Code to test === modified file 'mysql-test/suite/perfschema/t/rollback_table_io.test' --- a/mysql-test/suite/perfschema/t/rollback_table_io.test 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/t/rollback_table_io.test 2010-11-09 05:02:46 +0000 @@ -35,7 +35,7 @@ insert into test.t1 values(1,'One'); let $schema_to_dump= 'test'; # Start recording of events -update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; +update performance_schema.setup_consumers set enabled = 'YES'; set autocommit = off; === modified file 'mysql-test/suite/perfschema/t/selects.test' --- a/mysql-test/suite/perfschema/t/selects.test 2010-11-08 19:35:17 +0000 +++ b/mysql-test/suite/perfschema/t/selects.test 2010-11-09 05:02:46 +0000 @@ -188,5 +188,5 @@ DROP FUNCTION t_ps_func; DROP TABLE t1; DROP TABLE t_event; -UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES'; +UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES'; === modified file 'mysql-test/suite/perfschema/t/temp_table_io.test' --- a/mysql-test/suite/perfschema/t/temp_table_io.test 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/t/temp_table_io.test 2010-11-09 05:02:46 +0000 @@ -26,7 +26,7 @@ eval drop temporary table if exists $tab --enable_warnings # Start recording events -update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; +update performance_schema.setup_consumers set enabled = 'YES'; insert into marker set a = 1; eval create temporary table $table_item ( a varchar(255) not null, b int not null) engine = $engine_type; === modified file 'mysql-test/suite/perfschema/t/trigger_table_io.test' --- a/mysql-test/suite/perfschema/t/trigger_table_io.test 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/t/trigger_table_io.test 2010-11-09 05:02:46 +0000 @@ -48,7 +48,7 @@ create trigger t1_ad after delete on t1 for each row insert into test.t2 set b = old.a, v = 99; # Start recording events -update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; +update performance_schema.setup_consumers set enabled = 'YES'; # Code to test === modified file 'mysql-test/suite/perfschema/t/view_table_io.test' --- a/mysql-test/suite/perfschema/t/view_table_io.test 2010-07-13 14:17:39 +0000 +++ b/mysql-test/suite/perfschema/t/view_table_io.test 2010-11-09 05:02:46 +0000 @@ -32,7 +32,7 @@ drop table if exists test.no_index_tab; # Start recording events -update performance_schema.SETUP_CONSUMERS set enabled='YES'; +update performance_schema.setup_consumers set enabled='YES'; insert into marker set a = 1; eval create table test.no_index_tab ( a varchar(255) not null, b int not null) engine = $engine_type; --===============5681388941012705948== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-\ # merge/ # testament_sha1: 89f06eb02c4d49a9e7adc8ed8d0cbdcb9f0a2f93 # timestamp: 2010-11-09 06:03:14 +0100 # source_branch: file:///Users/malff/BZR_TREE/mysql-5.5-bugteam/ # base_revision_id: marc.alff@stripped\ # gxb4xp1pb34jcmfs # # Begin bundle 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 --===============5681388941012705948==--