database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.7' into 10.8

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-11-03 11:38:48 +01:00
parent 33825755c7 5e196a7b73
commit a2c85f378e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/columnstore/columnstore

Submodule storage/columnstore/columnstore updated: 1071ce9548...5923beeab9

7
storage/spider/spd_db_mysql.cc
View File

@@ -1968,8 +1968,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;