diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 09:49:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 09:49:38 +0200 |
| commit | 3ff4eb07edfd41a61d8283b59c35a29637297b3c (patch) | |
| tree | 512e58b367d8c2ff4e9990a72e049c325a9263c4 /sql/slave.cc | |
| parent | a27bfb2a872ea48a5083c2558bca58dc4358316f (diff) | |
| parent | 23f705f3a2e4125ed7026e1c9f3207088baa5fc0 (diff) | |
| download | mariadb-git-3ff4eb07edfd41a61d8283b59c35a29637297b3c.tar.gz | |
Merge 10.9 into 10.10
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 e39efcc6bbc..eac1326df34 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -7426,9 +7426,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); |