diff options
| author | Georg Richter <georg@mariadb.com> | 2015-10-13 16:35:53 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-01-27 16:34:05 +0100 |
| commit | 33e5a8aba2a9c7a4ccf62c7504db36a5a51702f7 (patch) | |
| tree | c2cbb5b44ea43d037934f67d8382677790943278 | |
| parent | ef3ca5c3ba9a03a213634e51ce27e8b95cce3a99 (diff) | |
| download | mariadb-git-33e5a8aba2a9c7a4ccf62c7504db36a5a51702f7.tar.gz | |
On Windows SSL works with sockets only, so we shouldn't tell the client
that we support SSL when using named pipes or shared memory.
| -rw-r--r-- | sql/sql_acl.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index c6793241f70..638460df683 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -11260,13 +11260,16 @@ 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; - if (ssl_acceptor_fd) + /* 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) { thd->client_capabilities |= CLIENT_SSL; thd->client_capabilities |= CLIENT_SSL_VERIFY_SERVER_CERT; |