diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 10:00:52 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 10:00:52 +0200 |
| commit | 64071d30bdbf2ba4e09935786ccb9337c8faf77c (patch) | |
| tree | 153d4160c66f121f11741a5cdd9cf18d0d2051ea /client | |
| parent | 922f7ba75c864a9ae4d0e55fa66860dae306136f (diff) | |
| parent | 3ff4eb07edfd41a61d8283b59c35a29637297b3c (diff) | |
| download | mariadb-git-64071d30bdbf2ba4e09935786ccb9337c8faf77c.tar.gz | |
Merge 10.10 into 10.11
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlcheck.c | 3 | ||||
| -rw-r--r-- | client/mysqlslap.c | 3 | ||||
| -rw-r--r-- | client/mysqltest.cc | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index c984433357c..12804b3c667 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -1165,7 +1165,10 @@ static int dbConnect(char *host, char *user, char *passwd) opt_ssl_capath, opt_ssl_cipher); mysql_options(&mysql_connection, MYSQL_OPT_SSL_CRL, opt_ssl_crl); mysql_options(&mysql_connection, MYSQL_OPT_SSL_CRLPATH, opt_ssl_crlpath); + mysql_options(&mysql_connection, MARIADB_OPT_TLS_VERSION, opt_tls_version); } + mysql_options(&mysql_connection, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, + (char*)&opt_ssl_verify_server_cert); #endif if (opt_protocol) mysql_options(&mysql_connection,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol); diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 5871e899fad..54df0124063 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -304,7 +304,10 @@ void set_mysql_connect_options(MYSQL *mysql) opt_ssl_capath, opt_ssl_cipher); mysql_options(mysql, MYSQL_OPT_SSL_CRL, opt_ssl_crl); mysql_options(mysql, MYSQL_OPT_SSL_CRLPATH, opt_ssl_crlpath); + mysql_options(mysql, MARIADB_OPT_TLS_VERSION, opt_tls_version); } + mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, + (char*)&opt_ssl_verify_server_cert); #endif if (opt_protocol) mysql_options(mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol); diff --git a/client/mysqltest.cc b/client/mysqltest.cc index a7d31298306..3930a325d09 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -9887,6 +9887,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); mysql_options(con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &opt_ssl_verify_server_cert); } |