diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-16 18:17:51 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-16 18:17:51 +0400 |
| commit | 11005f34132ff3e01baa8abce211587c9ee7d058 (patch) | |
| tree | e8d77e1bf325d073d8cd699baf2f47f4109aada5 /vio/vio.c | |
| parent | 5064d03b80f2219cbcfbd1e4e66243fc713e7943 (diff) | |
| parent | bff85079d32bd8860c86f6f4855db56961d3c56a (diff) | |
| download | mariadb-git-11005f34132ff3e01baa8abce211587c9ee7d058.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'vio/vio.c')
| -rw-r--r-- | vio/vio.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vio/vio.c b/vio/vio.c index aed99e72d54..bdb21077f44 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -311,5 +311,11 @@ void vio_end(void) { #ifdef HAVE_YASSL yaSSL_CleanUp(); +#elif defined(HAVE_OPENSSL) + // This one is needed on the client side + ERR_remove_state(0); + ERR_free_strings(); + EVP_cleanup(); + CRYPTO_cleanup_all_ex_data(); #endif } |