diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 21:56:03 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 21:56:03 +0200 |
| commit | 601e6f4b2a78921304bc1d779991c615ee229f89 (patch) | |
| tree | 0a9f9390874c91b9e4430fecfbbffa72967e7b69 /libmysql | |
| parent | 3d4095603952aca95892d55fb1ef435132de1197 (diff) | |
| download | mariadb-git-601e6f4b2a78921304bc1d779991c615ee229f89.tar.gz | |
Fixed compiler warnings
Don't assert if my_thread_end() is called twice (common case)
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 6a592f64e49..8c4eb2279e1 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -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) |