1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-7187 perfschema.aggregate fails sporadically in buildbot

Browse Source 
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.
This commit is contained in:
Elena Stepanova 2015-03-08 23:12:19 +02:00
parent d61573d3e5
commit 6fc0a8af24
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/perfschema/r/aggregate.result
View File

@ -1,4 +1,6 @@
"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';
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;

7
mysql-test/suite/perfschema/t/aggregate.test
View File

@ -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
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;