diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-05-09 12:31:53 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-05-13 14:27:16 +0200 |
commit | ab8415d9835c750e7b9c71595744c95d4426d591 (patch) | |
tree | 5a765391645bc8daa1326ec89e49de4138abbba5 /mysql-test/suite.pm | |
parent | b22959903b89e798f8804ec9a815c88f75915cd9 (diff) | |
download | mariadb-git-ab8415d9835c750e7b9c71595744c95d4426d591.tar.gz |
move encryption tests to a dedicate suite
remove few tests for variables that never existed (merge error)
Diffstat (limited to 'mysql-test/suite.pm')
-rw-r--r-- | mysql-test/suite.pm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 5eafd4e2ffd..b063f32c506 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -66,10 +66,6 @@ sub skip_combinations { unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ and $1 ge "1.0.1"; - $skip{'include/encryption_algorithms.combinations'} = [ 'ctr' ] - unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ - and $1 ge "1.0.1"; - %skip; } |