database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-25 13:42:52 +03:00
Code

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

Browse Source 
This reverts commit 2ee149be4e9319208dfcfb77712aa1ef805f6ba8.
This commit is contained in:
Georg Richter 2015-10-13 17:10:16 +02:00 committed by Vladislav Vaintroub
parent 33e5a8aba2
commit c1bf5ba27e
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_acl.cc
View File

@ -11260,16 +11260,13 @@ static bool send_server_handshake_packet(MPVIO_EXT *mpvio,
*end++= protocol_version; *end++= protocol_version;
thd->client_capabilities= CLIENT_BASIC_FLAGS; thd->client_capabilities= CLIENT_BASIC_FLAGS;
if (opt_using_transactions) if (opt_using_transactions)
thd->client_capabilities|= CLIENT_TRANSACTIONS; thd->client_capabilities|= CLIENT_TRANSACTIONS;
thd->client_capabilities|= CAN_CLIENT_COMPRESS; thd->client_capabilities|= CAN_CLIENT_COMPRESS;
/* Currently we support SSL with sockets only */ if (ssl_acceptor_fd)
if (thd->active_vio->type != VIO_TYPE_NAMEDPIPE &&
thd->active_vio->type != VIO_TYPE_SHARED_MEMORY &&
ssl_acceptor_fd)
{ {
thd->client_capabilities |= CLIENT_SSL; thd->client_capabilities |= CLIENT_SSL;
thd->client_capabilities |= CLIENT_SSL_VERIFY_SERVER_CERT; thd->client_capabilities |= CLIENT_SSL_VERIFY_SERVER_CERT;