[Commits] 6fc0a8a: MDEV-7187 perfschema.aggregate fails sporadically in buildbot

elenst at montyprogram.com elenst at montyprogram.com
Sun Mar 8 23:15:52 EET 2015


revision-id: 6fc0a8af243befc8504676b9d7a6f6bbeafb85b1
parent(s): d61573d3e5c8f9d85b88f9fa2e79160b159bf67d
committer: Elena Stepanova
branch nick: 10.0
timestamp: 2015-03-08 23:12:19 +0200
message:

MDEV-7187 perfschema.aggregate fails sporadically in buildbot

During slow execution, e.g. under valgrind, there was a chance
that Aria checkpoint would happen while P_S tables were being
queried; it could cause different data in joined P_S, and
thus combinations of results that the test did not expect.

Fixed by disabling Aria checkpoints for the test.

---
 mysql-test/suite/perfschema/r/aggregate.result |    3 +++
 mysql-test/suite/perfschema/t/aggregate.test   |    7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/mysql-test/suite/perfschema/r/aggregate.result b/mysql-test/suite/perfschema/r/aggregate.result
index ab927f5..c8fa1cc 100644
--- a/mysql-test/suite/perfschema/r/aggregate.result
+++ b/mysql-test/suite/perfschema/r/aggregate.result
@@ -1,4 +1,6 @@
 "General cleanup"
+set @aria_checkpoint_interval_save= @@global.aria_checkpoint_interval;
+set @@global.aria_checkpoint_interval= 0;
 drop table if exists t1;
 update performance_schema.setup_instruments set enabled = 'NO';
 update performance_schema.setup_consumers set enabled = 'NO';
@@ -116,3 +118,4 @@ update performance_schema.setup_consumers set enabled = 'YES';
 update performance_schema.setup_instruments
 set enabled = 'YES', timed = 'YES';
 drop table test.t1;
+set @@global.aria_checkpoint_interval= @aria_checkpoint_interval_save;
diff --git a/mysql-test/suite/perfschema/t/aggregate.test b/mysql-test/suite/perfschema/t/aggregate.test
index 672737a..fe30a7b 100644
--- a/mysql-test/suite/perfschema/t/aggregate.test
+++ b/mysql-test/suite/perfschema/t/aggregate.test
@@ -6,6 +6,10 @@
 
 --echo "General cleanup"
 
+# MDEV-7187 - test fails sporadically in buildbot
+set @aria_checkpoint_interval_save= @@global.aria_checkpoint_interval;
+set @@global.aria_checkpoint_interval= 0;
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
@@ -188,3 +192,6 @@ update performance_schema.setup_instruments
   set enabled = 'YES', timed = 'YES';
 
 drop table test.t1;
+
+set @@global.aria_checkpoint_interval= @aria_checkpoint_interval_save;
+


More information about the commits mailing list