diff options
author | Elena Stepanova <elenst@montyprogram.com> | 2017-01-01 23:13:04 +0200 |
---|---|---|
committer | Elena Stepanova <elenst@montyprogram.com> | 2017-01-05 17:33:48 +0200 |
commit | 5302ef2c955d98bf3b1fb1f94c036d904c8af922 (patch) | |
tree | cd3b0f224e4fd56f11f035422b1497aeb15e55a2 /mysql-test/suite | |
parent | f1ee011a6cbda1069a6ec9b5e2428451a64861fd (diff) | |
download | mariadb-git-5302ef2c955d98bf3b1fb1f94c036d904c8af922.tar.gz |
MDEV-11700 funcs_2.innodb_charset fails in buldbot on valgrind builder with timeout
When the test is run as a part of the suite with valgrind,
only allow it to be executed if --big-test is set.
If the test is run by specifying its name explicitly, it
will still be executed, even with valgrind without big-test,
MTR has special logic for that
Diffstat (limited to 'mysql-test/suite')
-rw-r--r-- | mysql-test/suite/funcs_2/t/innodb_charset.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/funcs_2/t/innodb_charset.test b/mysql-test/suite/funcs_2/t/innodb_charset.test index b77bacfc01c..da4dea44ad7 100644 --- a/mysql-test/suite/funcs_2/t/innodb_charset.test +++ b/mysql-test/suite/funcs_2/t/innodb_charset.test @@ -6,6 +6,7 @@ # Checking of other prerequisites is in charset_master.test # ################################################################################ +--source include/no_valgrind_without_big.inc --source include/have_innodb.inc let $engine_type= InnoDB; |