diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-03-29 15:25:08 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-03 16:19:10 +0200 |
| commit | f5369faf5bbfb56b5e945836eb3f7c7ee88b4079 (patch) | |
| tree | 0b2e1e7bb89dd17951d9c5bf8499252b58c8950d /sql-common | |
| parent | df6197c8b93bd686cfc25e72890c28070b22f195 (diff) | |
| download | mariadb-git-f5369faf5bbfb56b5e945836eb3f7c7ee88b4079.tar.gz | |
don't disable SSL when connecting via libmysqld
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 7d92f71d69f..fc591e21616 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2532,10 +2532,10 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio, if (mysql->client_flag & CLIENT_MULTI_STATEMENTS) mysql->client_flag|= CLIENT_MULTI_RESULTS; -#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) +#ifdef HAVE_OPENSSL if (mysql->options.use_ssl) mysql->client_flag|= CLIENT_SSL; -#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY*/ +#endif /* HAVE_OPENSSL */ if (mpvio->db) mysql->client_flag|= CLIENT_CONNECT_WITH_DB; |