diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-18 11:30:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-18 11:30:06 +0300 |
| commit | 3c88ce4cd112f696002d5f7461db68a3dafeb838 (patch) | |
| tree | 8860f823877b8d816fbca45d9e6926bcbc8f012d /client/mysqlbinlog.cc | |
| parent | 44d06cd39df2bdde6f7ac31d5340f1f683683c99 (diff) | |
| parent | e85e4814eeca9123b23c23b40dd776416bfba2ca (diff) | |
| download | mariadb-git-3c88ce4cd112f696002d5f7461db68a3dafeb838.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'client/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 090d743c61b..93e23b106c2 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -2126,6 +2126,7 @@ static Exit_status safe_connect() 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); |