diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-04-26 17:55:27 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-27 19:12:44 +0200 |
commit | b8c840500816c514b6722145a7f307c499793b69 (patch) | |
tree | 1f90dbeb8d0de87b41a02476e20f3bf04ca7772a /mysql-test/include | |
parent | 0636637e37a4471ae2ef44b4932c6dcb4d9a77cf (diff) | |
download | mariadb-git-b8c840500816c514b6722145a7f307c499793b69.tar.gz |
cleanup: simplify setting of ssl* options in my.cnf templates
magic--
Diffstat (limited to 'mysql-test/include')
-rw-r--r-- | mysql-test/include/default_client.cnf | 6 | ||||
-rw-r--r-- | mysql-test/include/default_mysqld.cnf | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/include/default_client.cnf b/mysql-test/include/default_client.cnf index bcd6a4849d2..e326b308f5f 100644 --- a/mysql-test/include/default_client.cnf +++ b/mysql-test/include/default_client.cnf @@ -20,3 +20,9 @@ default-character-set=latin1 [mysql_upgrade] default-character-set=latin1 + +[mysqltest] +loose-ssl-ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem +loose-ssl-cert=@ENV.MYSQL_TEST_DIR/std_data/client-cert.pem +loose-ssl-key=@ENV.MYSQL_TEST_DIR/std_data/client-key.pem +loose-skip-ssl diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index b5b16461781..44a7fd12d27 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -108,6 +108,10 @@ binlog-direct-non-transactional-updates default-storage-engine=myisam +loose-ssl-ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem +loose-ssl-cert=@ENV.MYSQL_TEST_DIR/std_data/server-cert.pem +loose-ssl-key=@ENV.MYSQL_TEST_DIR/std_data/server-key.pem + # here, at the end of [mysqld] group mtr will automatically disable # all optional plugins. |