diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-10 17:16:27 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-10 17:16:27 +0300 |
| commit | 3ead95118098340f7fe36e34e1690839d183db1e (patch) | |
| tree | 90dcbcf7f6793609af78220fd45bf7337f00ff62 /sql-common | |
| parent | 7053e26e1869962ef473043686996f40ac0fb88c (diff) | |
| parent | 1d43f71c7b4c39a6fd196c104b5ebafb65376199 (diff) | |
| download | mariadb-git-3ead95118098340f7fe36e34e1690839d183db1e.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, 4 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 203e822d3da..8c093abf7e0 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2518,6 +2518,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 */ |