From 906f97d3108df8370489f1f5a2531d8a43d8ce1a Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 22 Apr 2016 13:10:14 +0200 Subject: [PATCH] MDEV-8481 mysql-test - main.func_crypt fails if FIPS=1 disable the test when crypt(3) doesn't work --- mysql-test/include/have_crypt.inc | 9 +++++---- mysql-test/r/have_crypt.require | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 mysql-test/r/have_crypt.require 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); +} diff --git a/mysql-test/r/have_crypt.require b/mysql-test/r/have_crypt.require deleted file mode 100644 index 739fbb738f0..00000000000 --- a/mysql-test/r/have_crypt.require +++ /dev/null @@ -1,2 +0,0 @@ -Variable_name Value -have_crypt YES