diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-07 17:11:22 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-07 17:11:22 +0300 |
| commit | 4c89cff5582e786d1cde40b75c2290c136e64e31 (patch) | |
| tree | 098edebe3e6e97ca234bf8842580851f807cd57a /sql-common | |
| parent | 4ede2fec4cb7165a469776bfdbf247db86acb297 (diff) | |
| parent | 400a8eb60f832030a04a248e2c96552aa3f44055 (diff) | |
| download | mariadb-git-4c89cff5582e786d1cde40b75c2290c136e64e31.tar.gz | |
Merge branch '10.0' into 10.1
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 e2d4a0949df..35127b4e546 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2512,10 +2512,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; |