diff options
| -rw-r--r-- | libmysql/libmysql.c | 4 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index a6b7d2d6c8a..242144abc50 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -204,11 +204,11 @@ void STDCALL mysql_server_end() mysql_client_plugin_deinit(); + finish_client_errs(); + vio_end(); #ifdef EMBEDDED_LIBRARY end_embedded_server(); #endif - finish_client_errs(); - vio_end(); /* If library called my_init(), free memory allocated by it */ if (!org_my_init_done) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 90c1a83b9fc..73995980ffc 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1851,7 +1851,9 @@ void clean_up(bool print_message) delete binlog_filter; delete rpl_filter; end_ssl(); +#ifndef EMBEDDED_LIBRARY vio_end(); +#endif /*!EMBEDDED_LIBRARY*/ my_regex_end(); #if defined(ENABLED_DEBUG_SYNC) /* End the debug sync facility. See debug_sync.cc. */ |