summaryrefslogtreecommitdiff
path: root/mysql-test/lib
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-02-20 17:49:21 +0200
committerMichael Widenius <monty@askmonty.org>2012-02-20 17:49:21 +0200
commit038b739c98009cf0b4b7b7c2c18421051abf79f2 (patch)
treec31b05bf35b15358f7b0a89cfd8b5b43e2901ad8 /mysql-test/lib
parent3c07d04580fe5f28ff8bdabd1249b8123d7da76b (diff)
parentae07ec6cbf08e311e538f5149f93385e5bcaa7a6 (diff)
downloadmariadb-git-038b739c98009cf0b4b7b7c2c18421051abf79f2.tar.gz
Merge with MariaDB 5.1 and MySQL 5.1.61
Diffstat (limited to 'mysql-test/lib')
-rw-r--r--mysql-test/lib/mtr_cases.pm7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 6acbe623e22..a4c37c69d4c 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -931,6 +931,13 @@ sub collect_one_test_case {
$tinfo->{'long_test'}= 1;
}
+ if ( ! $tinfo->{'big_test'} and $::opt_big_test > 1 )
+ {
+ $tinfo->{'skip'}= 1;
+ $tinfo->{'comment'}= "Small test";
+ return $tinfo
+ }
+
if ( $tinfo->{'need_debug'} && ! $::debug_compiled_binaries )
{
$tinfo->{'skip'}= 1;