1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Fixed compiler warnings

Don't assert if my_thread_end() is called twice (common case)
This commit is contained in:
monty@mysql.com/narttu.mysql.fi
2006-11-30 21:56:03 +02:00
parent 3d40956039
commit 601e6f4b2a
27 changed files with 129 additions and 96 deletions

View File

@ -175,6 +175,9 @@ void STDCALL mysql_server_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)
{
@ -185,10 +188,11 @@ void STDCALL mysql_server_end()
#endif
}
else
{
free_charsets();
mysql_thread_end();
finish_client_errs();
free_charsets();
vio_end();
}
mysql_client_init= org_my_init_done= 0;
#ifdef EMBEDDED_SERVER
if (stderror_file)