diff options
author | Staale Smedseng <staale.smedseng@sun.com> | 2010-02-26 15:30:14 +0100 |
---|---|---|
committer | Staale Smedseng <staale.smedseng@sun.com> | 2010-02-26 15:30:14 +0100 |
commit | 600a28368916ae07c0694ae090dcba7f2c52b12a (patch) | |
tree | b32a770ac7c9db71ae25b1590e774c3fe0f3a43f /include | |
parent | ca6691533a7e2a454bbb614583a0058bf7acd2d2 (diff) | |
download | mariadb-git-600a28368916ae07c0694ae090dcba7f2c52b12a.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.h | 2 |
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); |