diff options
| author | monty@narttu.mysql.fi <> | 2006-11-30 22:38:12 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2006-11-30 22:38:12 +0200 |
| commit | 430d215c58ba78a018ff1299cb537d66f41deaae (patch) | |
| tree | ed9e2b22ed77e3ea701164ea1905e9d4c8da0cf5 /libmysql | |
| parent | 0a673596a288505374b6232d4e17f08934829767 (diff) | |
| parent | 601e6f4b2a78921304bc1d779991c615ee229f89 (diff) | |
| download | mariadb-git-430d215c58ba78a018ff1299cb537d66f41deaae.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 89243817638..6398c607eea 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -175,8 +175,10 @@ void STDCALL mysql_server_end() #ifdef EMBEDDED_LIBRARY end_embedded_server(); #endif - /* If library called my_init(), free memory allocated by it */ finish_client_errs(); + vio_end(); + + /* If library called my_init(), free memory allocated by it */ if (!org_my_init_done) { my_end(MY_DONT_FREE_DBUG); @@ -184,8 +186,11 @@ void STDCALL mysql_server_end() DBUG_POP(); } else + { + free_charsets(); mysql_thread_end(); - vio_end(); + } + mysql_client_init= org_my_init_done= 0; #ifdef EMBEDDED_SERVER if (stderror_file) |