diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-22 13:13:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-24 18:15:20 +0200 |
| commit | 797cadce47ecacd9dff2ee4829786e0be3009748 (patch) | |
| tree | 74b2d00cc929dd3873a152047f0fb11bed053bd8 /mysql-test/t | |
| parent | 906f97d3108df8370489f1f5a2531d8a43d8ce1a (diff) | |
| download | mariadb-git-797cadce47ecacd9dff2ee4829786e0be3009748.tar.gz | |
MDEV-8482 mysql-test - main.func_encrypt fails if FIPS=1
* check for openssl errors in DES_ENCRYPT/DES_DECRYPT
* disable the test when DES doesn't work
* also disable main.func_des_encrypt
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/func_des_encrypt.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/func_encrypt.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/func_des_encrypt.test b/mysql-test/t/func_des_encrypt.test index e121aedab06..c9661b81cc0 100644 --- a/mysql-test/t/func_des_encrypt.test +++ b/mysql-test/t/func_des_encrypt.test @@ -1,4 +1,4 @@ --- source include/have_ssl_crypto_functs.inc +-- source include/have_des.inc # This test can't be in func_encrypt.test, because it requires # --des-key-file to not be set. diff --git a/mysql-test/t/func_encrypt.test b/mysql-test/t/func_encrypt.test index 18fb072966b..e24cb80f995 100644 --- a/mysql-test/t/func_encrypt.test +++ b/mysql-test/t/func_encrypt.test @@ -1,4 +1,4 @@ --- source include/have_ssl_crypto_functs.inc +-- source include/have_des.inc --disable_warnings drop table if exists t1; |