diff options
author | unknown <hf@deer.(none)> | 2005-04-21 13:19:02 +0500 |
---|---|---|
committer | unknown <hf@deer.(none)> | 2005-04-21 13:19:02 +0500 |
commit | 99b46dd42bfe0a796c53beac4d8112b998d4db0a (patch) | |
tree | 46f43609e3bce9b8bafcec7d829c77d46106d8c1 /libmysql | |
parent | ac9f15e8857567097148cf0664d4149d7bb4001a (diff) | |
parent | 812eecb0a6707e24d216257e2123747270e606b4 (diff) | |
download | mariadb-git-99b46dd42bfe0a796c53beac4d8112b998d4db0a.tar.gz |
Merging
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/libmysql.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index dbdaadf86bf..bf797dfd580 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -187,6 +187,7 @@ void STDCALL mysql_server_end() else mysql_thread_end(); finish_client_errs(); + free_charsets(); mysql_client_init= org_my_init_done= 0; } |