From: Marc Alff Date: December 1 2010 8:01am Subject: bzr commit into mysql-5.5-bugteam branch (marc.alff:3158) Bug#58621 List-Archive: http://lists.mysql.com/commits/125604 X-Bug: 58621 Message-Id: <201012010802.oB182SH9026429@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8943554654938090968==" --===============8943554654938090968== 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-5.5-bugteam-58621/ based on revid:nirbhay.choubey@stripped 3158 Marc Alff 2010-12-01 Bug#58621 perfschema.dml_ews_by_thread_by_event_name test failure This fix affects the test suite only. Before this fix, performance schema tests dml_*.test could fail with spurious failure, depending on the table content. This fix simplifies the SELECT tests in the dml_*.test scripts, to only verify that the SELECT operation passed the security checks and succeeded, which was the original intent of the test. Usage of --replace_column 1 # 2 # 3 # 4 # ... to discard the test output was replaced by a simpler and more maintainable --disable_result_log which also work for empty tables. modified: 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_rwlock_instances.result mysql-test/suite/perfschema/r/dml_threads.result 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_rwlock_instances.test mysql-test/suite/perfschema/t/dml_threads.test === modified file 'mysql-test/suite/perfschema/r/dml_cond_instances.result' --- a/mysql-test/suite/perfschema/r/dml_cond_instances.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/dml_cond_instances.result 2010-12-01 08:01:04 +0000 @@ -1,9 +1,6 @@ select * from performance_schema.cond_instances limit 1; -NAME OBJECT_INSTANCE_BEGIN -# # select * from performance_schema.cond_instances where name='FOO'; -NAME OBJECT_INSTANCE_BEGIN insert into performance_schema.cond_instances set name='FOO', object_instance_begin=12; ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'cond_instances' === modified file 'mysql-test/suite/perfschema/r/dml_events_waits_current.result' --- a/mysql-test/suite/perfschema/r/dml_events_waits_current.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/dml_events_waits_current.result 2010-12-01 08:01:04 +0000 @@ -1,10 +1,7 @@ select * from performance_schema.events_waits_current where event_name like 'Wait/Synch/%' limit 1; -THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS -# # # # # # # # NULL NULL NULL # NULL # NULL 0 select * from performance_schema.events_waits_current where event_name='FOO'; -THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS insert into performance_schema.events_waits_current set thread_id='1', event_id=1, event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; === modified file 'mysql-test/suite/perfschema/r/dml_events_waits_history.result' --- a/mysql-test/suite/perfschema/r/dml_events_waits_history.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/dml_events_waits_history.result 2010-12-01 08:01:04 +0000 @@ -1,18 +1,11 @@ select * from performance_schema.events_waits_history where event_name like 'Wait/Synch/%' limit 1; -THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS -# # # # # # # # NULL NULL NULL # NULL # NULL 0 select * from performance_schema.events_waits_history where event_name='FOO'; -THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS select * from performance_schema.events_waits_history where event_name like 'Wait/Synch/%' order by timer_wait limit 1; -THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS -# # # # # # # # NULL NULL NULL # NULL # NULL 0 select * from performance_schema.events_waits_history where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1; -THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS -# # # # # # # # NULL NULL NULL # NULL # NULL 0 insert into performance_schema.events_waits_history set thread_id='1', event_id=1, event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; === modified file 'mysql-test/suite/perfschema/r/dml_events_waits_history_long.result' --- a/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result 2010-12-01 08:01:04 +0000 @@ -1,18 +1,11 @@ select * from performance_schema.events_waits_history_long where event_name like 'Wait/Synch/%' limit 1; -THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS -# # # # # # # # NULL NULL NULL # NULL # NULL 0 select * from performance_schema.events_waits_history_long where event_name='FOO'; -THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS select * from performance_schema.events_waits_history_long where event_name like 'Wait/Synch/%' order by timer_wait limit 1; -THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS -# # # # # # # # NULL NULL NULL # NULL # NULL 0 select * from performance_schema.events_waits_history_long where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1; -THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS -# # # # # # # # NULL NULL NULL # NULL # NULL 0 insert into performance_schema.events_waits_history_long set thread_id='1', event_id=1, event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; === modified file 'mysql-test/suite/perfschema/r/dml_ews_by_instance.result' --- a/mysql-test/suite/perfschema/r/dml_ews_by_instance.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/dml_ews_by_instance.result 2010-12-01 08:01:04 +0000 @@ -1,26 +1,15 @@ select * from performance_schema.events_waits_summary_by_instance where event_name like 'Wait/Synch/%' limit 1; -EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT -# # # # # # # select * from performance_schema.events_waits_summary_by_instance where event_name='FOO'; -EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT select * from performance_schema.events_waits_summary_by_instance order by count_star limit 1; -EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT -# # # # # # # select * from performance_schema.events_waits_summary_by_instance order by count_star desc limit 1; -EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT -# # # # # # # select * from performance_schema.events_waits_summary_by_instance where min_timer_wait > 0 order by count_star limit 1; -EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT -# # # # # # # select * from performance_schema.events_waits_summary_by_instance where min_timer_wait > 0 order by count_star desc limit 1; -EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT -# # # # # # # insert into performance_schema.events_waits_summary_by_instance set event_name='FOO', object_instance_begin=0, count_star=1, sum_timer_wait=2, min_timer_wait=3, === modified file 'mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result' --- a/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result 2010-12-01 08:01:04 +0000 @@ -1,10 +1,7 @@ select * from performance_schema.events_waits_summary_by_thread_by_event_name where event_name like 'Wait/Synch/%' limit 1; -THREAD_ID EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT -# # # # # # # select * from performance_schema.events_waits_summary_by_thread_by_event_name where event_name='FOO'; -THREAD_ID EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT insert into performance_schema.events_waits_summary_by_thread_by_event_name set event_name='FOO', thread_id=1, count_star=1, sum_timer_wait=2, min_timer_wait=3, === modified file 'mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result' --- a/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result 2010-12-01 08:01:04 +0000 @@ -1,10 +1,7 @@ select * from performance_schema.events_waits_summary_global_by_event_name where event_name like 'Wait/Synch/%' limit 1; -EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT -# # # # # # select * from performance_schema.events_waits_summary_global_by_event_name where event_name='FOO'; -EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT insert into performance_schema.events_waits_summary_global_by_event_name set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3, avg_timer_wait=4, max_timer_wait=5; === modified file 'mysql-test/suite/perfschema/r/dml_file_instances.result' --- a/mysql-test/suite/perfschema/r/dml_file_instances.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/dml_file_instances.result 2010-12-01 08:01:04 +0000 @@ -1,9 +1,6 @@ select * from performance_schema.file_instances limit 1; -FILE_NAME EVENT_NAME OPEN_COUNT -# # # select * from performance_schema.file_instances where file_name='FOO'; -FILE_NAME EVENT_NAME OPEN_COUNT insert into performance_schema.file_instances set file_name='FOO', event_name='BAR', open_count=12; ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_instances' === modified file 'mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result' --- a/mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result 2010-12-01 08:01:04 +0000 @@ -1,10 +1,7 @@ select * from performance_schema.file_summary_by_event_name where event_name like 'Wait/io/%' limit 1; -EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE -# # # # # select * from performance_schema.file_summary_by_event_name where event_name='FOO'; -EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE insert into performance_schema.file_summary_by_event_name set event_name='FOO', count_read=1, count_write=2, sum_number_of_bytes_read=4, sum_number_of_bytes_write=5; === modified file 'mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result' --- a/mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result 2010-12-01 08:01:04 +0000 @@ -1,10 +1,7 @@ select * from performance_schema.file_summary_by_instance where event_name like 'Wait/io/%' limit 1; -FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE -# # # # # # select * from performance_schema.file_summary_by_instance where event_name='FOO'; -FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE insert into performance_schema.file_summary_by_instance set event_name='FOO', count_read=1, count_write=2, sum_number_of_bytes_read=4, sum_number_of_bytes_write=5; === modified file 'mysql-test/suite/perfschema/r/dml_mutex_instances.result' --- a/mysql-test/suite/perfschema/r/dml_mutex_instances.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/dml_mutex_instances.result 2010-12-01 08:01:04 +0000 @@ -1,9 +1,6 @@ select * from performance_schema.mutex_instances limit 1; -NAME OBJECT_INSTANCE_BEGIN LOCKED_BY_THREAD_ID -# # # select * from performance_schema.mutex_instances where name='FOO'; -NAME OBJECT_INSTANCE_BEGIN LOCKED_BY_THREAD_ID insert into performance_schema.mutex_instances set name='FOO', object_instance_begin=12; ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'mutex_instances' === modified file 'mysql-test/suite/perfschema/r/dml_rwlock_instances.result' --- a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result 2010-12-01 08:01:04 +0000 @@ -1,9 +1,6 @@ select * from performance_schema.rwlock_instances limit 1; -NAME OBJECT_INSTANCE_BEGIN WRITE_LOCKED_BY_THREAD_ID READ_LOCKED_BY_COUNT -# # # # select * from performance_schema.rwlock_instances where name='FOO'; -NAME OBJECT_INSTANCE_BEGIN WRITE_LOCKED_BY_THREAD_ID READ_LOCKED_BY_COUNT insert into performance_schema.rwlock_instances set name='FOO', object_instance_begin=12; ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'rwlock_instances' === modified file 'mysql-test/suite/perfschema/r/dml_threads.result' --- a/mysql-test/suite/perfschema/r/dml_threads.result 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/r/dml_threads.result 2010-12-01 08:01:04 +0000 @@ -1,10 +1,7 @@ select * from performance_schema.threads where name like 'Thread/%' limit 1; -THREAD_ID PROCESSLIST_ID NAME -# # # select * from performance_schema.threads where name='FOO'; -THREAD_ID PROCESSLIST_ID NAME insert into performance_schema.threads set name='FOO', thread_id=1, processlist_id=2; ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'threads' === modified file 'mysql-test/suite/perfschema/t/dml_cond_instances.test' --- a/mysql-test/suite/perfschema/t/dml_cond_instances.test 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/t/dml_cond_instances.test 2010-12-01 08:01:04 +0000 @@ -18,11 +18,12 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_column 1 # 2 # +--disable_result_log select * from performance_schema.cond_instances limit 1; select * from performance_schema.cond_instances where name='FOO'; +--enable_result_log --error ER_TABLEACCESS_DENIED_ERROR insert into performance_schema.cond_instances === modified file 'mysql-test/suite/perfschema/t/dml_events_waits_current.test' --- a/mysql-test/suite/perfschema/t/dml_events_waits_current.test 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/t/dml_events_waits_current.test 2010-12-01 08:01:04 +0000 @@ -18,12 +18,13 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # +--disable_result_log select * from performance_schema.events_waits_current where event_name like 'Wait/Synch/%' limit 1; select * from performance_schema.events_waits_current where event_name='FOO'; +--enable_result_log --error ER_TABLEACCESS_DENIED_ERROR insert into performance_schema.events_waits_current === modified file 'mysql-test/suite/perfschema/t/dml_events_waits_history.test' --- a/mysql-test/suite/perfschema/t/dml_events_waits_history.test 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/t/dml_events_waits_history.test 2010-12-01 08:01:04 +0000 @@ -18,20 +18,19 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # +--disable_result_log select * from performance_schema.events_waits_history where event_name like 'Wait/Synch/%' limit 1; select * from performance_schema.events_waits_history where event_name='FOO'; ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # select * from performance_schema.events_waits_history where event_name like 'Wait/Synch/%' order by timer_wait limit 1; ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # select * from performance_schema.events_waits_history where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1; +--enable_result_log --error ER_TABLEACCESS_DENIED_ERROR insert into performance_schema.events_waits_history === modified file 'mysql-test/suite/perfschema/t/dml_events_waits_history_long.test' --- a/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test 2010-12-01 08:01:04 +0000 @@ -18,20 +18,19 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # +--disable_result_log select * from performance_schema.events_waits_history_long where event_name like 'Wait/Synch/%' limit 1; select * from performance_schema.events_waits_history_long where event_name='FOO'; ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # select * from performance_schema.events_waits_history_long where event_name like 'Wait/Synch/%' order by timer_wait limit 1; ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 # select * from performance_schema.events_waits_history_long where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1; +--enable_result_log --error ER_TABLEACCESS_DENIED_ERROR insert into performance_schema.events_waits_history_long === modified file 'mysql-test/suite/perfschema/t/dml_ews_by_instance.test' --- a/mysql-test/suite/perfschema/t/dml_ews_by_instance.test 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/t/dml_ews_by_instance.test 2010-12-01 08:01:04 +0000 @@ -18,28 +18,25 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # +--disable_result_log select * from performance_schema.events_waits_summary_by_instance where event_name like 'Wait/Synch/%' limit 1; select * from performance_schema.events_waits_summary_by_instance where event_name='FOO'; ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # select * from performance_schema.events_waits_summary_by_instance order by count_star limit 1; ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # select * from performance_schema.events_waits_summary_by_instance order by count_star desc limit 1; ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # select * from performance_schema.events_waits_summary_by_instance where min_timer_wait > 0 order by count_star limit 1; ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # select * from performance_schema.events_waits_summary_by_instance where min_timer_wait > 0 order by count_star desc limit 1; +--enable_result_log --error ER_TABLEACCESS_DENIED_ERROR insert into performance_schema.events_waits_summary_by_instance === modified file 'mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test' --- a/mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test 2010-12-01 08:01:04 +0000 @@ -18,12 +18,13 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # +--disable_result_log select * from performance_schema.events_waits_summary_by_thread_by_event_name where event_name like 'Wait/Synch/%' limit 1; select * from performance_schema.events_waits_summary_by_thread_by_event_name where event_name='FOO'; +--enable_result_log --error ER_TABLEACCESS_DENIED_ERROR insert into performance_schema.events_waits_summary_by_thread_by_event_name === modified file 'mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test' --- a/mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test 2010-12-01 08:01:04 +0000 @@ -18,12 +18,13 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # +--disable_result_log select * from performance_schema.events_waits_summary_global_by_event_name where event_name like 'Wait/Synch/%' limit 1; select * from performance_schema.events_waits_summary_global_by_event_name where event_name='FOO'; +--enable_result_log --error ER_TABLEACCESS_DENIED_ERROR insert into performance_schema.events_waits_summary_global_by_event_name === modified file 'mysql-test/suite/perfschema/t/dml_file_instances.test' --- a/mysql-test/suite/perfschema/t/dml_file_instances.test 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/t/dml_file_instances.test 2010-12-01 08:01:04 +0000 @@ -18,11 +18,12 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_column 1 # 2 # 3 # +--disable_result_log select * from performance_schema.file_instances limit 1; select * from performance_schema.file_instances where file_name='FOO'; +--enable_result_log --error ER_TABLEACCESS_DENIED_ERROR insert into performance_schema.file_instances === modified file 'mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test' --- a/mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test 2010-12-01 08:01:04 +0000 @@ -18,12 +18,13 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_column 1 # 2 # 3 # 4 # 5 # +--disable_result_log select * from performance_schema.file_summary_by_event_name where event_name like 'Wait/io/%' limit 1; select * from performance_schema.file_summary_by_event_name where event_name='FOO'; +--enable_result_log --error ER_TABLEACCESS_DENIED_ERROR insert into performance_schema.file_summary_by_event_name === modified file 'mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test' --- a/mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test 2010-12-01 08:01:04 +0000 @@ -18,12 +18,13 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_column 1 # 2 # 3 # 4 # 5 # 6 # +--disable_result_log select * from performance_schema.file_summary_by_instance where event_name like 'Wait/io/%' limit 1; select * from performance_schema.file_summary_by_instance where event_name='FOO'; +--enable_result_log --error ER_TABLEACCESS_DENIED_ERROR insert into performance_schema.file_summary_by_instance === modified file 'mysql-test/suite/perfschema/t/dml_mutex_instances.test' --- a/mysql-test/suite/perfschema/t/dml_mutex_instances.test 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/t/dml_mutex_instances.test 2010-12-01 08:01:04 +0000 @@ -18,11 +18,12 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_column 1 # 2 # 3 # +--disable_result_log select * from performance_schema.mutex_instances limit 1; select * from performance_schema.mutex_instances where name='FOO'; +--enable_result_log --error ER_TABLEACCESS_DENIED_ERROR insert into performance_schema.mutex_instances === modified file 'mysql-test/suite/perfschema/t/dml_rwlock_instances.test' --- a/mysql-test/suite/perfschema/t/dml_rwlock_instances.test 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/t/dml_rwlock_instances.test 2010-12-01 08:01:04 +0000 @@ -18,11 +18,12 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_column 1 # 2 # 3 # 4 # +--disable_result_log select * from performance_schema.rwlock_instances limit 1; select * from performance_schema.rwlock_instances where name='FOO'; +--enable_result_log --error ER_TABLEACCESS_DENIED_ERROR insert into performance_schema.rwlock_instances === modified file 'mysql-test/suite/perfschema/t/dml_threads.test' --- a/mysql-test/suite/perfschema/t/dml_threads.test 2010-11-03 15:42:33 +0000 +++ b/mysql-test/suite/perfschema/t/dml_threads.test 2010-12-01 08:01:04 +0000 @@ -18,12 +18,13 @@ --source include/not_embedded.inc --source include/have_perfschema.inc ---replace_column 1 # 2 # 3 # +--disable_result_log select * from performance_schema.threads where name like 'Thread/%' limit 1; select * from performance_schema.threads where name='FOO'; +--enable_result_log --error ER_TABLEACCESS_DENIED_ERROR insert into performance_schema.threads --===============8943554654938090968== 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-5.5-bugteam-58621/ # testament_sha1: c497ee569a46181a457dfa3cd785545bcef91797 # timestamp: 2010-12-01 09:01:11 +0100 # base_revision_id: nirbhay.choubey@stripped\ # tzmx16rp33gr407v # # Begin bundle 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 --===============8943554654938090968==--