diff options
| author | unknown <df@kahlann.erinye.com> | 2006-12-01 13:02:54 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-12-01 13:02:54 +0100 |
| commit | c06f995ba73834febc971b573a48d7b17dd1a36b (patch) | |
| tree | 90907c9ba079c9a6f4d555883abe4775ee5aa762 /libmysql/libmysql.c | |
| parent | 114197b589dcc5612943fb967082f1c1be9d23a9 (diff) | |
| parent | 25226de9ea52d06667c2c7fbd99f5cd014764241 (diff) | |
| download | mariadb-git-c06f995ba73834febc971b573a48d7b17dd1a36b.tar.gz | |
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'libmysql/libmysql.c')
| -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 5af172603ad..304c20132ff 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) |