diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-03 11:47:10 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-03 11:47:10 +0100 |
commit | f8997c68fe645cc94f6730a135aca5e530dec449 (patch) | |
tree | b3d607eb1a106a16b900d7da6af81a60332a7584 /storage/spider/spd_db_mysql.cc | |
parent | 49a22c5897823c528d52886f6048d5b4c91e221f (diff) | |
parent | acf8dc0a577f8fed2d059c033f4efbd07dd95ac0 (diff) | |
download | mariadb-git-mariadb-10.10.2.tar.gz |
Merge branch '10.9' into 10.10mariadb-10.10.2
Diffstat (limited to 'storage/spider/spd_db_mysql.cc')
-rw-r--r-- | storage/spider/spd_db_mysql.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc index a9a95799e05..03caaa41a32 100644 --- a/storage/spider/spd_db_mysql.cc +++ b/storage/spider/spd_db_mysql.cc @@ -1896,8 +1896,11 @@ int spider_db_mbase::connect( conn->tgt_ssl_cert_length | conn->tgt_ssl_key_length ) { - mysql_ssl_set(db_conn, conn->tgt_ssl_key, conn->tgt_ssl_cert, - conn->tgt_ssl_ca, conn->tgt_ssl_capath, conn->tgt_ssl_cipher); + mysql_options(db_conn, MYSQL_OPT_SSL_KEY, conn->tgt_ssl_key); + mysql_options(db_conn, MYSQL_OPT_SSL_CERT, conn->tgt_ssl_cert); + mysql_options(db_conn, MYSQL_OPT_SSL_CA, conn->tgt_ssl_ca); + mysql_options(db_conn, MYSQL_OPT_SSL_CAPATH, conn->tgt_ssl_capath); + mysql_options(db_conn, MYSQL_OPT_SSL_CIPHER, conn->tgt_ssl_cipher); if (conn->tgt_ssl_vsc) { my_bool verify_flg = TRUE; |