diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 09:39:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 09:39:46 +0200 |
| commit | 9e27e53dfac1c911a593065a0fcadc5729957d29 (patch) | |
| tree | 679b56d887a1544264a9f872a2d8b3a7659cd8f2 /sql/slave.cc | |
| parent | b7ae4d442aa32752798f1d3b6122c35c4ebe2d07 (diff) | |
| parent | 9044e016c54762300beb2cd609b41c285bbf8794 (diff) | |
| download | mariadb-git-9e27e53dfac1c911a593065a0fcadc5729957d29.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index cf290fb8a89..361e77f2d04 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -7342,9 +7342,9 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi, mi->ssl_ca[0]?mi->ssl_ca:0, mi->ssl_capath[0]?mi->ssl_capath:0, mi->ssl_cipher[0]?mi->ssl_cipher:0); - mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, - &mi->ssl_verify_server_cert); - mysql_options(mysql, MYSQL_OPT_SSL_CRLPATH, + mysql_options(mysql, MYSQL_OPT_SSL_CRL, + mi->ssl_crl[0] ? mi->ssl_crl : 0); + mysql_options(mysql, MYSQL_OPT_SSL_CRLPATH, mi->ssl_crlpath[0] ? mi->ssl_crlpath : 0); mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &mi->ssl_verify_server_cert); |