1 files changed, 13 insertions, 21 deletions
diff --git a/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test b/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test
index 73dc0aefd06..a7fc1937529 100644
--- a/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test
+++ b/mysql-test/suite/perfschema/t/dml_events_waits_history_long.test
@@ -18,53 +18,45 @@
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 
---replace_column 1 # 2 # 3 # 4 # 5 # 6 # 7 # 8 # 12 # 14 #
-select * from performance_schema.EVENTS_WAITS_HISTORY_LONG
+--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
+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
+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
+select * from performance_schema.events_waits_history_long
   where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1;
+--enable_result_log
 
---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG'
 --error ER_TABLEACCESS_DENIED_ERROR
-insert into performance_schema.EVENTS_WAITS_HISTORY_LONG
+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;
 
---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG'
 --error ER_TABLEACCESS_DENIED_ERROR
-update performance_schema.EVENTS_WAITS_HISTORY_LONG
+update performance_schema.events_waits_history_long
   set timer_start=12;
 
---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG'
 --error ER_TABLEACCESS_DENIED_ERROR
-update performance_schema.EVENTS_WAITS_HISTORY_LONG
+update performance_schema.events_waits_history_long
   set timer_start=12 where thread_id=0;
 
---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG'
 --error ER_TABLEACCESS_DENIED_ERROR
-delete from performance_schema.EVENTS_WAITS_HISTORY_LONG
+delete from performance_schema.events_waits_history_long
   where thread_id=1;
 
---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG'
 --error ER_TABLEACCESS_DENIED_ERROR
-delete from performance_schema.EVENTS_WAITS_HISTORY_LONG;
+delete from performance_schema.events_waits_history_long;
 
---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG'
 -- error ER_TABLEACCESS_DENIED_ERROR
-LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY_LONG READ;
+LOCK TABLES performance_schema.events_waits_history_long READ;
 UNLOCK TABLES;
 
---replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG'
 -- error ER_TABLEACCESS_DENIED_ERROR
-LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY_LONG WRITE;
+LOCK TABLES performance_schema.events_waits_history_long WRITE;
 UNLOCK TABLES;