Merge branch '10.7' into 10.8

columnstore @ d31b6699

-Subproject commit 1071ce954807104d25c0951f422e83d5e17406fe
+Subproject commit d31b66999520bc03925929896ffb16206aa69fc2

storage/spider/spd_db_mysql.cc

@@ -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;