summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorSergeyV@selena. <>2005-12-01 23:43:37 +0300
committerSergeyV@selena. <>2005-12-01 23:43:37 +0300
commit830abaaa01ce4f21324e65a42eaf28b70461f8e0 (patch)
tree300014d3f59e3bd452990ba3af7590bfa7e8492b /mysys
parent22b43351f823b08123b19aeee4c8f7bfa365bd22 (diff)
downloadmariadb-git-830abaaa01ce4f21324e65a42eaf28b70461f8e0.tar.gz
Fixes bug #11892. 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 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)