Commit 6fc0a8af authored by Elena Stepanova's avatar Elena Stepanova

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.
parent d61573d3
"General cleanup" "General cleanup"
set @aria_checkpoint_interval_save= @@global.aria_checkpoint_interval;
set @@global.aria_checkpoint_interval= 0;
drop table if exists t1; drop table if exists t1;
update performance_schema.setup_instruments set enabled = 'NO'; update performance_schema.setup_instruments set enabled = 'NO';
update performance_schema.setup_consumers set enabled = 'NO'; update performance_schema.setup_consumers set enabled = 'NO';
...@@ -116,3 +118,4 @@ update performance_schema.setup_consumers set enabled = 'YES'; ...@@ -116,3 +118,4 @@ update performance_schema.setup_consumers set enabled = 'YES';
update performance_schema.setup_instruments update performance_schema.setup_instruments
set enabled = 'YES', timed = 'YES'; set enabled = 'YES', timed = 'YES';
drop table test.t1; drop table test.t1;
set @@global.aria_checkpoint_interval= @aria_checkpoint_interval_save;
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
--echo "General cleanup" --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 --disable_warnings
drop table if exists t1; drop table if exists t1;
--enable_warnings --enable_warnings
...@@ -188,3 +192,6 @@ update performance_schema.setup_instruments ...@@ -188,3 +192,6 @@ update performance_schema.setup_instruments
set enabled = 'YES', timed = 'YES'; set enabled = 'YES', timed = 'YES';
drop table test.t1; drop table test.t1;
set @@global.aria_checkpoint_interval= @aria_checkpoint_interval_save;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment