summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2017-02-23 19:46:10 +0200
committerElena Stepanova <elenst@montyprogram.com>2017-02-23 19:46:10 +0200
commitbdb672fe96cfb75baab0ea1f1db8870d6cb8911b (patch)
tree243344183f4e094d71b6a9cd138e5cac773b7faf /storage
parent365c4e971a684151762058befb27b54832dc8779 (diff)
downloadmariadb-git-bdb672fe96cfb75baab0ea1f1db8870d6cb8911b.tar.gz
MDEV-12120 tokudb_bugs.xa-N tests fail with timeout on valgrind
The tests are disabled for valgrind in 5.6/10.x (LP:1549196), so they should be disabled in 5.5 as well
Diffstat (limited to 'storage')
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/t/xa-3.test1
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/t/xa-4.test1
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test1
3 files changed, 3 insertions, 0 deletions
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/xa-3.test b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-3.test
index 116d5b5d99b..5e3db1b11b6 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/t/xa-3.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-3.test
@@ -2,6 +2,7 @@
-- source include/have_tokudb.inc
-- source include/have_debug.inc
-- source include/not_embedded.inc
+-- source include/not_valgrind.inc
--disable_warnings
drop table if exists t1, t2;
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/xa-4.test b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-4.test
index 014b371630f..4992eae3f5f 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/t/xa-4.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-4.test
@@ -2,6 +2,7 @@
-- source include/have_tokudb.inc
-- source include/have_debug.inc
-- source include/not_embedded.inc
+-- source include/not_valgrind.inc
--disable_warnings
drop table if exists t1, t2;
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test
index 3d9e1be711b..495849e862c 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/xa-6.test
@@ -1,5 +1,6 @@
--source include/have_tokudb.inc
--source include/have_debug.inc
+-- source include/not_valgrind.inc
--disable_warnings
drop table if exists t1;