1
0
mirror of https://github.com/MariaDB/server.git synced 2025-06-12 01:53:02 +03:00

10.0-base merge

This commit is contained in:
Sergei Golubchik
2013-12-16 13:02:21 +01:00
1367 changed files with 82358 additions and 55472 deletions

View File

@ -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)