summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2010-02-26 15:30:14 +0100
committerStaale Smedseng <staale.smedseng@sun.com>2010-02-26 15:30:14 +0100
commit04f1434781cf459ca98d4f0c385f093d30db3f2e (patch)
treeb32a770ac7c9db71ae25b1590e774c3fe0f3a43f /include
parent5d9a74f22dfefd27d0bb62a1829a2484741bbf8a (diff)
downloadmariadb-git-04f1434781cf459ca98d4f0c385f093d30db3f2e.tar.gz
Bug #45058 init_available_charsets uses double checked locking
A client doing multiple mysql_library_init() and mysql_library_end() calls over the lifetime of the process may experience lost character set data, potentially even a SIGSEGV. This patch reinstates the reloading of character set data when a mysql_library_init() is done after a mysql_library_end().
Diffstat (limited to 'include')
-rw-r--r--include/my_sys.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index a4ff5c30de7..59b44307b6f 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -950,7 +950,7 @@ extern my_bool resolve_charset(const char *cs_name,
extern my_bool resolve_collation(const char *cl_name,
CHARSET_INFO *default_cl,
CHARSET_INFO **cl);
-
+extern void free_charsets(void);
extern char *get_charsets_dir(char *buf);
extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);
extern my_bool init_compiled_charsets(myf flags);