diff options
| author | unknown <konstantin@mysql.com> | 2006-02-07 15:26:58 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-02-07 15:26:58 +0300 |
| commit | e4518ee34db10fdaf7cee5c95c39a224a78ae73b (patch) | |
| tree | 087c30fed4aea55f1567d7a6f6e3c1d5b35ca8b0 /mysys | |
| parent | 742671f7dd6dee5265c2a8bb9230e75cc1178231 (diff) | |
| parent | 5c142d365885352df55c7a1ea748f5e7296fda02 (diff) | |
| download | mariadb-git-e4518ee34db10fdaf7cee5c95c39a224a78ae73b.tar.gz | |
Merge mysql.com:/home/kostja/mysql/tmp_merge
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
mysql-test/r/information_schema_db.result:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
mysql-test/r/information_schema.result:
SCCS merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index f28f47e090e..c2bfdde0ddd 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -152,6 +152,7 @@ void my_end(int infoflag) DBUG_PRINT("error",("%s",errbuff[0])); } } + free_charsets(); my_once_free(); if ((infoflag & MY_GIVE_INFO) || print_info) |