From 2c79f57530e0094038c4bebb799df6be602473e3 Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Fri, 12 Feb 2016 03:47:25 +0200 Subject: [PATCH] MDEV-9464 perfschema.global_read_lock fails when executed after perfschema.dml_setup_instruments dml_setup_instruments did not restore settings in setup_instruments table after updating it as a part of the test flow --- mysql-test/suite/perfschema/t/dml_setup_instruments.test | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mysql-test/suite/perfschema/t/dml_setup_instruments.test b/mysql-test/suite/perfschema/t/dml_setup_instruments.test index 8a4f11ba51f..6b4fe89a1cf 100644 --- a/mysql-test/suite/perfschema/t/dml_setup_instruments.test +++ b/mysql-test/suite/perfschema/t/dml_setup_instruments.test @@ -88,3 +88,10 @@ UNLOCK TABLES; --echo UPDATE performance_schema.setup_instruments SET timed='NO' ORDER BY RAND(); + +# MTR is configured to start with everything set to ON, +# so we need to restore it after the previous update +--disable_query_log +update performance_schema.setup_instruments set timed='YES'; +--enable_query_log +