diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 09:43:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 09:43:38 +0200 |
| commit | 23f705f3a2e4125ed7026e1c9f3207088baa5fc0 (patch) | |
| tree | 83543a2d8f33ab565b258ed0064eed15ac054a3a /sql/slave.cc | |
| parent | 3ba8828396301e7d4ddd54188628146251cab829 (diff) | |
| parent | b3c254339be29d3be24c16fa0c150ff8ebd0bfda (diff) | |
| download | mariadb-git-23f705f3a2e4125ed7026e1c9f3207088baa5fc0.tar.gz | |
Merge 10.8 into 10.9
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 5fdecb3e1b6..4adbccc4968 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -7415,9 +7415,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); |