diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2023-02-12 13:13:57 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2023-05-02 14:24:37 +0200 |
| commit | c5e9613151bf52e376cdab9604033deea7209fcd (patch) | |
| tree | 76d1474ff9c9abdb4504aedac4030a2f3b9dc382 | |
| parent | e02a2f4e9f2dec1a4f4740fa302bd09c5981f908 (diff) | |
| download | mariadb-git-c5e9613151bf52e376cdab9604033deea7209fcd.tar.gz | |
Revert "don't use ssl for windows named pipes - it doesn't work"bb-10.10-serg
This reverts commit e1caa4bd5e8b4645944b85d4b603bf9fc9ef6ca4.
Will be fixed in CONC-635 instead
| -rw-r--r-- | client/mysql.cc | 2 | ||||
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index cf541160ea6..fff0c5984ad 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1481,7 +1481,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 && opt_protocol <= MYSQL_PROTOCOL_SOCKET) + if (opt_use_ssl) { 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 53c95bf85c0..f92dce2da49 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -132,7 +132,7 @@ xb_mysql_connect() opt_socket ? opt_socket : "not set"); #ifdef HAVE_OPENSSL - if (opt_use_ssl && opt_protocol <= MYSQL_PROTOCOL_SOCKET) + if (opt_use_ssl) { mysql_ssl_set(connection, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, opt_ssl_capath, |