From 0838fd00e7c95d54541c2126ef933d0ae65c02f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Wed, 16 Nov 2016 12:07:12 +0200 Subject: [PATCH] MDEV-11185: innodb.innodb_trx_weight fails in buildbot Problem was that test assumes locks to be granted on first-come-first-served (FCFS) policy. However, in 10.2 we use by default Variance-Aware-Transaction-Scheduling (VATS) algorithm. Test failure fixed by setting lock wait policy to FCFS. --- mysql-test/suite/innodb/disabled.def | 2 +- mysql-test/suite/innodb/t/innodb_trx_weight.opt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 mysql-test/suite/innodb/t/innodb_trx_weight.opt diff --git a/mysql-test/suite/innodb/disabled.def b/mysql-test/suite/innodb/disabled.def index 09545bafefc..9f8de75ae14 100644 --- a/mysql-test/suite/innodb/disabled.def +++ b/mysql-test/suite/innodb/disabled.def @@ -11,4 +11,4 @@ ############################################################################## innodb_defragment_fill_factor : MDEV-10771 -innodb.innodb_trx_weight : MDEV-11185 + diff --git a/mysql-test/suite/innodb/t/innodb_trx_weight.opt b/mysql-test/suite/innodb/t/innodb_trx_weight.opt new file mode 100644 index 00000000000..bac39c99a74 --- /dev/null +++ b/mysql-test/suite/innodb/t/innodb_trx_weight.opt @@ -0,0 +1 @@ +--loose-innodb-lock-schedule-algorithm=FCFS