diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 18:55:27 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 18:55:27 +0300 |
| commit | aa59ecec89d89a29f7272352471a4064aa6db28c (patch) | |
| tree | a8b2b53ce4913adc27291105fbbe5389333607eb /sql-common | |
| parent | 7bbe324fc17d9734833f717921629c36d1d0c996 (diff) | |
| parent | 170bec36c0da1fb0269a063094a546022ed0888f (diff) | |
| download | mariadb-git-aa59ecec89d89a29f7272352471a4064aa6db28c.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, 4 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index fe43b593b1c..b1c2d9cf4e2 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2521,6 +2521,10 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio, mysql->client_flag|= CLIENT_MULTI_RESULTS; #ifdef HAVE_OPENSSL + if (mysql->options.ssl_key || mysql->options.ssl_cert || + mysql->options.ssl_ca || mysql->options.ssl_capath || + mysql->options.ssl_cipher) + mysql->options.use_ssl = 1; if (mysql->options.use_ssl) mysql->client_flag|= CLIENT_SSL; #endif /* HAVE_OPENSSL */ |