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 | |
| parent | 3212aaa995b9a20d4986f563bc7ebd34d5fc1477 (diff) | |
| download | mariadb-git-8bc712e481a18976853fa57a7be77aab6159d431.tar.gz | |
MDEV-6671 mysql_server_end breaks OpenSSL
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index fc4abb0ddd4..ca5d1ec8947 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -236,6 +236,8 @@ dynamic_column_exists dynamic_column_list dynamic_column_get dynamic_column_prepare_decimal +# +mariadb_deinitialize_ssl ) SET(CLIENT_API_FUNCTIONS 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 |