diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 09:43:13 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 09:43:13 +0200 |
| commit | b3c254339be29d3be24c16fa0c150ff8ebd0bfda (patch) | |
| tree | e1cebed6f3689750d4611dd8a12185c86054bb56 /client | |
| parent | 0751bfbcaf08c7c32de8d90b41b6c50ab525da6f (diff) | |
| parent | 9e27e53dfac1c911a593065a0fcadc5729957d29 (diff) | |
| download | mariadb-git-b3c254339be29d3be24c16fa0c150ff8ebd0bfda.tar.gz | |
Merge 10.7 into 10.8
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 88648650c28..ba67fd9b166 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -9874,6 +9874,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"); |