diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-03 18:08:30 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-03 18:08:30 +0300 |
| commit | 6a72b9096a9aa793571159ca9aa8fbc7fdf743b1 (patch) | |
| tree | d02fcab11100ed4605c9cbb336b323e6805b59db /sql-common | |
| parent | 8ffbb825e6a09d3055f46ed4b456573aef5c474c (diff) | |
| parent | f5369faf5bbfb56b5e945836eb3f7c7ee88b4079 (diff) | |
| download | mariadb-git-6a72b9096a9aa793571159ca9aa8fbc7fdf743b1.tar.gz | |
Merge branch '5.5' into 10.0
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 dcd92abecad..a509645b743 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2509,10 +2509,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; |