diff options
| author | Georg Richter <georg@mariadb.com> | 2015-10-13 17:10:16 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-01-27 16:34:05 +0100 |
| commit | c1bf5ba27ef2ec189fe890283e68dbd9bd2efca9 (patch) | |
| tree | 35389d6d894c554235b282a1329ebba21f4e6be2 | |
| parent | 33e5a8aba2a9c7a4ccf62c7504db36a5a51702f7 (diff) | |
| download | mariadb-git-c1bf5ba27ef2ec189fe890283e68dbd9bd2efca9.tar.gz | |
Revert "On Windows SSL works with sockets only, so we shouldn't tell the client"
This reverts commit 2ee149be4e9319208dfcfb77712aa1ef805f6ba8.
| -rw-r--r-- | sql/sql_acl.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 638460df683..c6793241f70 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -11260,16 +11260,13 @@ static bool send_server_handshake_packet(MPVIO_EXT *mpvio, *end++= protocol_version; thd->client_capabilities= CLIENT_BASIC_FLAGS; - + if (opt_using_transactions) thd->client_capabilities|= CLIENT_TRANSACTIONS; thd->client_capabilities|= CAN_CLIENT_COMPRESS; - /* Currently we support SSL with sockets only */ - if (thd->active_vio->type != VIO_TYPE_NAMEDPIPE && - thd->active_vio->type != VIO_TYPE_SHARED_MEMORY && - ssl_acceptor_fd) + if (ssl_acceptor_fd) { thd->client_capabilities |= CLIENT_SSL; thd->client_capabilities |= CLIENT_SSL_VERIFY_SERVER_CERT; |