From e1caa4bd5e8b4645944b85d4b603bf9fc9ef6ca4 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 17 Jun 2022 21:20:43 +0200 Subject: [PATCH] don't use ssl for windows named pipes - it doesn't work --- client/mysql.cc | 2 +- extra/mariabackup/backup_mysql.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/mysql.cc b/client/mysql.cc index 8e6f1938fd8..4099490356b 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1491,7 +1491,7 @@ static bool do_connect(MYSQL *mysql, const char *host, const char *user, if (opt_secure_auth) mysql_options(mysql, MYSQL_SECURE_AUTH, (char *) &opt_secure_auth); #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) - if (opt_use_ssl) + if (opt_use_ssl && opt_protocol <= MYSQL_PROTOCOL_SOCKET) { mysql_ssl_set(mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, opt_ssl_capath, opt_ssl_cipher); diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index 28424f5cf32..e06a3ae1b5c 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -131,7 +131,7 @@ xb_mysql_connect() opt_socket ? opt_socket : "not set"); #ifdef HAVE_OPENSSL - if (opt_use_ssl) + if (opt_use_ssl && opt_protocol <= MYSQL_PROTOCOL_SOCKET) { mysql_ssl_set(connection, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, opt_ssl_capath,