diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-19 17:23:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-19 17:23:39 +0100 |
| commit | 3495801e2e94df5a10cae6e056f65defa038a6b6 (patch) | |
| tree | de524b4bf45dbc19a95262843f2b72d0f5adb7bc /vio/viossl.c | |
| parent | df7b27f1fe308fd4011fa020bebd7c69bcd43383 (diff) | |
| parent | 496fda66fdc34b447ef4dec26d1250b034a321e3 (diff) | |
| download | mariadb-git-3495801e2e94df5a10cae6e056f65defa038a6b6.tar.gz | |
5.5 merge
Diffstat (limited to 'vio/viossl.c')
| -rw-r--r-- | vio/viossl.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index a4f0a1bd213..53e41ab2536 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -26,6 +26,18 @@ #ifdef HAVE_OPENSSL +#ifndef HAVE_YASSL +/* + yassl seem to be different here, SSL_get_error() value can be + directly passed to ERR_error_string(), and these errors don't go + into ERR_get_error() stack. + in openssl, apparently, SSL_get_error() values live in a different + namespace, one needs to use ERR_get_error() as an argument + for ERR_error_string(). +*/ +#define SSL_get_error(X,Y) ERR_get_error() +#endif + #ifndef DBUG_OFF static void |