From: Marc Alff Date: November 9 2010 5:04am Subject: bzr push into mysql-trunk-bugfixing branch (marc.alff:3335 to 3336) Bug#57609 List-Archive: http://lists.mysql.com/commits/123167 X-Bug: 57609 Message-Id: <201011090504.oA954CtD025952@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 3335 Marc Alff 2010-11-08 [merge] Merge mysql-5.5-bugteam --> mysql-trunk-bugfixing modified: mysql-test/suite/perfschema/include/binlog_common.inc mysql-test/suite/perfschema/include/cleanup_helper.inc mysql-test/suite/perfschema/include/privilege.inc mysql-test/suite/perfschema/include/setup_helper.inc mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/r/aggregate.result mysql-test/suite/perfschema/r/binlog_mix.result mysql-test/suite/perfschema/r/binlog_row.result mysql-test/suite/perfschema/r/binlog_stmt.result mysql-test/suite/perfschema/r/checksum.result mysql-test/suite/perfschema/r/column_privilege.result mysql-test/suite/perfschema/r/ddl_cond_instances.result mysql-test/suite/perfschema/r/ddl_events_waits_current.result mysql-test/suite/perfschema/r/ddl_events_waits_history.result mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result mysql-test/suite/perfschema/r/ddl_ews_by_instance.result mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result mysql-test/suite/perfschema/r/ddl_file_instances.result mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result mysql-test/suite/perfschema/r/ddl_fs_by_instance.result mysql-test/suite/perfschema/r/ddl_mutex_instances.result mysql-test/suite/perfschema/r/ddl_performance_timers.result mysql-test/suite/perfschema/r/ddl_rwlock_instances.result mysql-test/suite/perfschema/r/ddl_setup_consumers.result mysql-test/suite/perfschema/r/ddl_setup_instruments.result mysql-test/suite/perfschema/r/ddl_setup_timers.result mysql-test/suite/perfschema/r/ddl_threads.result mysql-test/suite/perfschema/r/dml_cond_instances.result mysql-test/suite/perfschema/r/dml_events_waits_current.result mysql-test/suite/perfschema/r/dml_events_waits_history.result mysql-test/suite/perfschema/r/dml_events_waits_history_long.result mysql-test/suite/perfschema/r/dml_ews_by_instance.result mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result mysql-test/suite/perfschema/r/dml_file_instances.result mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result mysql-test/suite/perfschema/r/dml_mutex_instances.result mysql-test/suite/perfschema/r/dml_performance_timers.result mysql-test/suite/perfschema/r/dml_rwlock_instances.result mysql-test/suite/perfschema/r/dml_setup_consumers.result mysql-test/suite/perfschema/r/dml_setup_instruments.result mysql-test/suite/perfschema/r/dml_setup_timers.result mysql-test/suite/perfschema/r/dml_threads.result mysql-test/suite/perfschema/r/func_file_io.result mysql-test/suite/perfschema/r/func_mutex.result mysql-test/suite/perfschema/r/global_read_lock.result mysql-test/suite/perfschema/r/information_schema.result mysql-test/suite/perfschema/r/misc.result mysql-test/suite/perfschema/r/myisam_file_io.result mysql-test/suite/perfschema/r/no_threads.result mysql-test/suite/perfschema/r/one_thread_per_con.result mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result mysql-test/suite/perfschema/r/privilege.result mysql-test/suite/perfschema/r/query_cache.result mysql-test/suite/perfschema/r/read_only.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/r/selects.result mysql-test/suite/perfschema/r/server_init.result mysql-test/suite/perfschema/r/start_server_no_cond_class.result mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-test/suite/perfschema/r/start_server_no_file_class.result mysql-test/suite/perfschema/r/start_server_no_file_inst.result mysql-test/suite/perfschema/r/start_server_no_mutex_class.result mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result mysql-test/suite/perfschema/r/start_server_no_table_hdl.result mysql-test/suite/perfschema/r/start_server_no_table_inst.result mysql-test/suite/perfschema/r/start_server_no_thread_class.result mysql-test/suite/perfschema/r/start_server_no_thread_inst.result mysql-test/suite/perfschema/r/start_server_nothing.result mysql-test/suite/perfschema/r/start_server_off.result mysql-test/suite/perfschema/r/start_server_on.result mysql-test/suite/perfschema/r/tampered_perfschema_table1.result mysql-test/suite/perfschema/t/aggregate.test mysql-test/suite/perfschema/t/checksum.test mysql-test/suite/perfschema/t/column_privilege.test mysql-test/suite/perfschema/t/ddl_cond_instances.test mysql-test/suite/perfschema/t/ddl_events_waits_current.test mysql-test/suite/perfschema/t/ddl_events_waits_history.test mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test mysql-test/suite/perfschema/t/ddl_ews_by_instance.test mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test mysql-test/suite/perfschema/t/ddl_file_instances.test mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test mysql-test/suite/perfschema/t/ddl_fs_by_instance.test mysql-test/suite/perfschema/t/ddl_mutex_instances.test mysql-test/suite/perfschema/t/ddl_performance_timers.test mysql-test/suite/perfschema/t/ddl_rwlock_instances.test mysql-test/suite/perfschema/t/ddl_setup_consumers.test mysql-test/suite/perfschema/t/ddl_setup_instruments.test mysql-test/suite/perfschema/t/ddl_setup_timers.test mysql-test/suite/perfschema/t/ddl_threads.test mysql-test/suite/perfschema/t/dml_cond_instances.test mysql-test/suite/perfschema/t/dml_events_waits_current.test mysql-test/suite/perfschema/t/dml_events_waits_history.test mysql-test/suite/perfschema/t/dml_events_waits_history_long.test mysql-test/suite/perfschema/t/dml_ews_by_instance.test mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test mysql-test/suite/perfschema/t/dml_file_instances.test mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test mysql-test/suite/perfschema/t/dml_mutex_instances.test mysql-test/suite/perfschema/t/dml_performance_timers.test mysql-test/suite/perfschema/t/dml_rwlock_instances.test mysql-test/suite/perfschema/t/dml_setup_consumers.test mysql-test/suite/perfschema/t/dml_setup_instruments.test mysql-test/suite/perfschema/t/dml_setup_timers.test mysql-test/suite/perfschema/t/dml_threads.test mysql-test/suite/perfschema/t/func_file_io.test mysql-test/suite/perfschema/t/func_mutex.test mysql-test/suite/perfschema/t/global_read_lock.test mysql-test/suite/perfschema/t/information_schema.test mysql-test/suite/perfschema/t/misc.test mysql-test/suite/perfschema/t/myisam_file_io.test mysql-test/suite/perfschema/t/no_threads.test mysql-test/suite/perfschema/t/one_thread_per_con.test mysql-test/suite/perfschema/t/privilege.test mysql-test/suite/perfschema/t/query_cache.test mysql-test/suite/perfschema/t/read_only.test mysql-test/suite/perfschema/t/schema.test mysql-test/suite/perfschema/t/selects.test mysql-test/suite/perfschema/t/server_init.test mysql-test/suite/perfschema/t/start_server_no_cond_class.test mysql-test/suite/perfschema/t/start_server_no_cond_inst.test mysql-test/suite/perfschema/t/start_server_no_file_class.test mysql-test/suite/perfschema/t/start_server_no_file_inst.test mysql-test/suite/perfschema/t/start_server_no_mutex_class.test mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test mysql-test/suite/perfschema/t/start_server_no_thread_class.test mysql-test/suite/perfschema/t/start_server_no_thread_inst.test mysql-test/suite/perfschema/t/start_server_nothing.test mysql-test/suite/perfschema/t/tampered_perfschema_table1.test mysql-test/suite/perfschema/t/thread_cache.test scripts/mysql_system_tables.sql storage/perfschema/table_events_waits.cc storage/perfschema/table_events_waits_summary.cc storage/perfschema/table_ews_global_by_event_name.cc storage/perfschema/table_file_instances.cc storage/perfschema/table_file_summary.cc storage/perfschema/table_performance_timers.cc storage/perfschema/table_setup_consumers.cc storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_timers.cc storage/perfschema/table_sync_instances.cc storage/perfschema/table_threads.cc storage/perfschema/table_threads.h === 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; No bundle (reason: useless for push emails).