diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2015-03-08 23:12:19 +0200 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2015-03-08 23:12:19 +0200 |
| commit | 6fc0a8af243befc8504676b9d7a6f6bbeafb85b1 (patch) | |
| tree | 5d320197c34ee6ae428d6e122979c47f94c5e265 | |
| parent | d61573d3e5c8f9d85b88f9fa2e79160b159bf67d (diff) | |
| download | mariadb-git-6fc0a8af243befc8504676b9d7a6f6bbeafb85b1.tar.gz | |
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.
| -rw-r--r-- | mysql-test/suite/perfschema/r/aggregate.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/t/aggregate.test | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/r/aggregate.result b/mysql-test/suite/perfschema/r/aggregate.result index ab927f544cf..c8fa1cc2b24 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 672737ae2a7..fe30a7b8697 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; + |