summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-04-22 13:10:14 +0200
committerSergei Golubchik <serg@mariadb.org>2016-04-24 18:15:20 +0200
commit906f97d3108df8370489f1f5a2531d8a43d8ce1a (patch)
treeb3d3717c0cb6747d06c5537a80ab5f4716d6db3e /mysql-test/include
parent78989b67d1b41259a7ce646ca93485d604ba215b (diff)
downloadmariadb-git-906f97d3108df8370489f1f5a2531d8a43d8ce1a.tar.gz
MDEV-8481 mysql-test - main.func_crypt fails if FIPS=1
disable the test when crypt(3) doesn't work
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/have_crypt.inc9
1 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/include/have_crypt.inc b/mysql-test/include/have_crypt.inc
index cbf0a7ac876..422f8922edc 100644
--- a/mysql-test/include/have_crypt.inc
+++ b/mysql-test/include/have_crypt.inc
@@ -1,4 +1,5 @@
--- require r/have_crypt.require
-disable_query_log;
-show variables like 'have_crypt';
-enable_query_log;
+# encrypt('a') is NULL if crypt(3) is not available
+# encrypt('a') is "*0" in fips mode
+if (`select length(encrypt('a')) > 3 IS NOT TRUE`) {
+ skip No crypt(3);
+}