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

…the client" This reverts commit 2ee149b.
MariaDB · Jan 27, 2016 · c1bf5ba · c1bf5ba
1 parent 33e5a8a
commit c1bf5ba
Showing 1 changed file with 2 additions and 5 deletions.
diff --git 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;