database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel

Browse Source 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
This commit is contained in:
df@kahlann.erinye.com
2006-12-01 13:02:54 +01:00
parent feb70084d3 601e6f4b2a
commit da7820c37d
77 changed files with 387 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libmysql/libmysql.c
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)