diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-11-30 13:10:52 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-11-30 13:10:52 +0200 |
| commit | 4eb8e51c269eb9447d3765a6e4deba0dc68dfa37 (patch) | |
| tree | 8efa892fbe6bebc98ca106cf4341d406b48cb7ea /sql/slave.cc | |
| parent | 11815641312fdbcab26e47e4b6655c155bc39bde (diff) | |
| download | mariadb-git-4eb8e51c269eb9447d3765a6e4deba0dc68dfa37.tar.gz | |
Merge 10.4 into 10.5
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 33a382edc47..715fa8cd69e 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -7281,9 +7281,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); |