summaryrefslogtreecommitdiff
path: root/vio/viossl.c
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-11-20 16:27:16 +0100
committerSergei Golubchik <sergii@pisem.net>2014-11-20 16:27:16 +0100
commitdbbe3651326e8e1ff9507686fe7b5ca1a28b0cbb (patch)
tree46454235d0476be2c58a765c293688fb6c7f0987 /vio/viossl.c
parent3c12c27907ed167e03e4bafd22ca7c551575738c (diff)
parent48f4961a12919405a719c951630a8b804e685997 (diff)
downloadmariadb-git-dbbe3651326e8e1ff9507686fe7b5ca1a28b0cbb.tar.gz
5.5 merge
Diffstat (limited to 'vio/viossl.c')
-rw-r--r--vio/viossl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/viossl.c b/vio/viossl.c
index 53e41ab2536..a0909ea9ec0 100644
--- a/vio/viossl.c
+++ b/vio/viossl.c
@@ -288,7 +288,7 @@ int vio_ssl_close(Vio *vio)
break;
default: /* Shutdown failed */
DBUG_PRINT("vio_error", ("SSL_shutdown() failed, error: %d",
- SSL_get_error(ssl, r)));
+ (int)SSL_get_error(ssl, r)));
break;
}
}