Revert "On Windows SSL works with sockets only, so we shouldn't tell the client"

This reverts commit 2ee149be4e9319208dfcfb77712aa1ef805f6ba8.

Revert "On Windows SSL works with sockets only, so we shouldn't tell the client"
This reverts commit 2ee149be4e9319208dfcfb77712aa1ef805f6ba8.
c1bf5ba2 · Georg Richter · Vladislav Vaintroub · 33e5a8ab · c1bf5ba2
Commit c1bf5ba2 authored Oct 13, 2015 by Georg Richter Committed by Vladislav Vaintroub Jan 27, 2016
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

sql/sql_acl.cc sql/sql_acl.cc +2 -5

No files found.
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -11266,10 +11266,7 @@ static bool send_server_handshake_packet(MPVIO_EXT *mpvio,

  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;