diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-11 21:31:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-11 21:31:47 +0300 |
| commit | 67fa97dc2c44f974bb26bba8a0efa3bb409e6bc5 (patch) | |
| tree | 5bbb79933755b9c8b8ea79af304e7d196f64e809 /vio | |
| parent | 1bf3e8ab43e982953d7534db902020d321364afb (diff) | |
| parent | 6b61f1bbad1a57509d1cd0c09e80e31fffcfc67d (diff) | |
| download | mariadb-git-67fa97dc2c44f974bb26bba8a0efa3bb409e6bc5.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viossl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index 000a526a892..b3e2bca6676 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -335,7 +335,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, DBUG_PRINT("info", ("ssl: %p timeout: %ld", ssl, timeout)); SSL_clear(ssl); SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout); - SSL_set_fd(ssl, sd); + SSL_set_fd(ssl, (int)sd); /* Since yaSSL does not support non-blocking send operations, use |