diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2015-01-19 17:31:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2015-01-19 17:31:59 +0100 |
| commit | 8bc712e481a18976853fa57a7be77aab6159d431 (patch) | |
| tree | 5ddf1d046b91193b1dc60dae71120745bb3496d4 /libmysql/libmysql.c | |
| parent | 3212aaa995b9a20d4986f563bc7ebd34d5fc1477 (diff) | |
| download | mariadb-git-8bc712e481a18976853fa57a7be77aab6159d431.tar.gz | |
MDEV-6671 mysql_server_end breaks OpenSSL
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 7a4fc9fabd4..df18d6d60da 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -205,7 +205,8 @@ void STDCALL mysql_server_end() mysql_client_plugin_deinit(); finish_client_errs(); - vio_end(); + if (mariadb_deinitialize_ssl) + vio_end(); #ifdef EMBEDDED_LIBRARY end_embedded_server(); #endif |