diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-05-04 15:23:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-05-04 15:23:26 +0200 |
| commit | 87e3e67f434628768b5125fbab7e8862fa60da1a (patch) | |
| tree | df19b8bcac9988d83270ed1da05f765bfc4e8624 /mysql-test/t/func_des_encrypt.test | |
| parent | 80da57cc4f0c717ee3e01ac5abccc859b88a2fbf (diff) | |
| parent | cee9ab9d85a8d75290b0d60bc7af26c8cf179a1d (diff) | |
| download | mariadb-git-87e3e67f434628768b5125fbab7e8862fa60da1a.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/t/func_des_encrypt.test')
| -rw-r--r-- | mysql-test/t/func_des_encrypt.test | 2 |
1 files changed, 1 insertions, 1 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. |