summaryrefslogtreecommitdiff
path: root/mysql-test/suite/perfschema/t/nesting.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/perfschema/t/nesting.test')
-rw-r--r--mysql-test/suite/perfschema/t/nesting.test8
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/suite/perfschema/t/nesting.test b/mysql-test/suite/perfschema/t/nesting.test
index 6144d0ff6d3..ee1581c284b 100644
--- a/mysql-test/suite/perfschema/t/nesting.test
+++ b/mysql-test/suite/perfschema/t/nesting.test
@@ -1,5 +1,8 @@
# Test to check the proper nesting of events
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+#-- source include/have_QC_Disabled.inc
+
--source include/not_embedded.inc
--source include/have_perfschema.inc
# On windows, the socket instrumentation collects an extra "opt"
@@ -42,6 +45,7 @@ update performance_schema.setup_instruments set enabled='YES', timed='YES'
'wait/synch/rwlock/sql/LOCK_grant',
'wait/synch/mutex/sql/THD::LOCK_thd_data',
'wait/synch/mutex/sql/THD::LOCK_thd_kill',
+ 'wait/synch/mutex/sql/THD::LOCK_thd_query',
'wait/io/file/sql/query_log');
update performance_schema.setup_instruments set enabled='YES', timed='YES'
@@ -107,7 +111,7 @@ set @marker_end = (select end_event_id from performance_schema.events_statements
select (@marker_end is not null) as expected;
# Will point to what happened on spurious test failures
-show status like "performance_schema%";
+show global status like "performance_schema%";
#
# This is the test itself:
@@ -185,5 +189,3 @@ update performance_schema.threads set instrumented='YES';
update performance_schema.setup_instruments set enabled='YES', timed='YES';
--enable_query_log
-
-