diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-05-09 13:24:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-05-09 13:24:52 +0200 |
| commit | c91ecf9e9bebf3cf2dafbd3193de4df94be09870 (patch) | |
| tree | a9ab429c8e8a6a50c38557cbdd38d9612480f49c /sql-common | |
| parent | 2645bda5f20ab10bc26dc1cb69f91b5505c1faae (diff) | |
| parent | c92168fcd26aad35bd4cb5d65175e3545133f201 (diff) | |
| download | mariadb-git-c91ecf9e9bebf3cf2dafbd3193de4df94be09870.tar.gz | |
Merge branch '10.1' into 10.2
Revert commit db0917f68f, because the fix for MDEV-12696
is coming from 5.5 and 10.1 in this merge.
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 47a68651e05..76dca42e14c 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1679,8 +1679,8 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) , mysql_options(mysql, MYSQL_OPT_SSL_CAPATH, capath) | mysql_options(mysql, MYSQL_OPT_SSL_CIPHER, cipher) ? 1 : 0); - mysql->options.use_ssl= TRUE; #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */ + mysql->options.use_ssl= TRUE; DBUG_RETURN(result); } @@ -2542,7 +2542,6 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio, int3store(buff+2, net->max_packet_size); end= buff+5; } -#ifdef HAVE_OPENSSL /* If client uses ssl and client also has to verify the server @@ -2560,6 +2559,7 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio, goto error; } +#ifdef HAVE_OPENSSL if (mysql->client_flag & CLIENT_SSL) { /* Do the SSL layering. */ |