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

mysql-5.5.31 merge

Browse source
This commit is contained in:
Sergei Golubchik 2013-05-07 13:05:09 +02:00
commit b381cf843c
264 changed files with 3750 additions and 1720 deletions
Download patch file Download diff file Expand all files Collapse all files

3
vio/viossl.c
View file

@ -183,6 +183,9 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
SSL_clear(ssl);
SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
SSL_set_fd(ssl, vio->sd);
#ifndef HAVE_YASSL
SSL_set_options(ssl, SSL_OP_NO_COMPRESSION);
#endif
if ((r= connect_accept_func(ssl)) < 1)
{