summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorSergeyV@selena. <>2005-12-01 23:17:00 +0300
committerSergeyV@selena. <>2005-12-01 23:17:00 +0300
commit885abbf3fb00ea0faac0da95048a4f51fdbd9cda (patch)
tree0b239b88485085e166c4dccb1c62717b786d9141 /mysys
parent12d1bf12315f5e25ea36453a9df86925e18c9d42 (diff)
downloadmariadb-git-885abbf3fb00ea0faac0da95048a4f51fdbd9cda.tar.gz
Fixes bug #6536. When MyODBC or any other client do my_init()/my_end()
several times, it was causing corruption of charset data stored in once_mem_pool. my_end() deallocated once_mem pool, but did not put a flag that charsets have to be reloaded. The fix addresses this problem.
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_init.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c
index 3e5130ec670..d68c76bef1b 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)