diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-09 22:11:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-09 22:16:26 +0200 |
| commit | 5a44e1a4024f1760021e5c6fd65773584d60513a (patch) | |
| tree | 782bf9fafe6d99bf4e2b34ebae98a973c3ae1f99 /mysql-test/include | |
| parent | 80f6b2259330f2bc4de1692b671ab553dc5b4353 (diff) | |
| download | mariadb-git-5a44e1a4024f1760021e5c6fd65773584d60513a.tar.gz | |
tests for MDEV-7937: Enforce SSL when --ssl client option is usedmariadb-5.5.44
* add a test when server certificate is verified successfully
* one test with two combinations (instead of two tests)
* verbose tets: make it print what it is doing
* fix the test to work with yassl and no-ssl builds
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_ssl_disabled.inc | 4 | ||||
| -rw-r--r-- | mysql-test/include/have_ssl_disabled.opt | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/include/have_ssl_disabled.inc b/mysql-test/include/have_ssl_disabled.inc deleted file mode 100644 index 6c672794146..00000000000 --- a/mysql-test/include/have_ssl_disabled.inc +++ /dev/null @@ -1,4 +0,0 @@ -if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME like 'have_ssl' and VARIABLE_VALUE like 'DISABLED'`) -{ - --skip Test requires ssl to be disabled. -} diff --git a/mysql-test/include/have_ssl_disabled.opt b/mysql-test/include/have_ssl_disabled.opt deleted file mode 100644 index a72d58c7839..00000000000 --- a/mysql-test/include/have_ssl_disabled.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-disable-ssl |