mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 00:54:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

10.0-base merge

Browse source 
(without InnoDB - all InnoDB changes were ignored)
This commit is contained in:
Sergei Golubchik 2013-06-06 21:32:29 +02:00
commit 72ba95873a
464 changed files with 8657 additions and 2905 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vio/viossl.c
View file

@ -383,6 +383,10 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
yaSSL_transport_set_send_function(ssl, yassl_send);
#endif
#if !defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION)
SSL_set_options(ssl, SSL_OP_NO_COMPRESSION);
#endif
if ((r= ssl_handshake_loop(vio, ssl, func)) < 1)
{
DBUG_PRINT("error", ("SSL_connect/accept failure"));