summaryrefslogtreecommitdiff
path: root/include/my_sys.h
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2005-08-08 19:52:30 +0500
committerunknown <bar@mysql.com>2005-08-08 19:52:30 +0500
commit4112dc21765162ae3dfd356eedf480720eb32904 (patch)
tree9af79335dde7a3443f3f55a42ed6fd07728796af /include/my_sys.h
parent062258ca7e6d457a978be0be73a6ba727f81b6c8 (diff)
downloadmariadb-git-4112dc21765162ae3dfd356eedf480720eb32904.tar.gz
Bug#5439 : mysql_server_init() crashes if ShiftJIS path is passed
(important for Adobe). mf_pack.c, mf_dirname.c, charset.c, my_sys.h: - adding fs_character_set() function on Windows - ignoring fake slashes which are just multibyte parts in several functions in /mysys Verified by Shu to work on WinXP and Win2k. Test is not possible, or very hard to do. include/my_sys.h: Bug#5439 : mysql_server_init() crashes if ShiftJIS path is passed (important for Adobe) - adding fs_character_set() function on Windows - ignoring fake slashes which are just multibyte parts in several functions in /mysys mysys/charset.c: d mysys/mf_dirname.c: d mysys/mf_pack.c: d
Diffstat (limited to 'include/my_sys.h')
-rw-r--r--include/my_sys.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index e56f07a8140..8752aa30772 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -788,6 +788,11 @@ extern my_bool init_compiled_charsets(myf flags);
extern void add_compiled_collation(CHARSET_INFO *cs);
extern ulong escape_string_for_mysql(CHARSET_INFO *charset_info, char *to,
const char *from, ulong length);
+#ifdef __WIN__
+#define BACKSLASH_MBTAIL
+/* File system character set */
+extern CHARSET_INFO *fs_character_set(void);
+#endif
#ifdef __WIN__
extern my_bool have_tcpip; /* Is set if tcpip is used */