diff options
author | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-11-30 13:10:52 +0200 |
---|---|---|
committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-11-30 13:10:52 +0200 |
commit | 4eb8e51c269eb9447d3765a6e4deba0dc68dfa37 (patch) | |
tree | 8efa892fbe6bebc98ca106cf4341d406b48cb7ea /client/mysqltest.cc | |
parent | 11815641312fdbcab26e47e4b6655c155bc39bde (diff) | |
download | mariadb-git-4eb8e51c269eb9447d3765a6e4deba0dc68dfa37.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'client/mysqltest.cc')
-rw-r--r-- | client/mysqltest.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index c7ddc0d0d6a..636ab06d745 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -9768,6 +9768,7 @@ int main(int argc, char **argv) opt_ssl_capath, opt_ssl_cipher); mysql_options(con->mysql, MYSQL_OPT_SSL_CRL, opt_ssl_crl); mysql_options(con->mysql, MYSQL_OPT_SSL_CRLPATH, opt_ssl_crlpath); + mysql_options(con->mysql, MARIADB_OPT_TLS_VERSION, opt_tls_version); #if MYSQL_VERSION_ID >= 50000 /* Turn on ssl_verify_server_cert only if host is "localhost" */ opt_ssl_verify_server_cert= opt_host && !strcmp(opt_host, "localhost"); |