summaryrefslogtreecommitdiff
path: root/include/my_sys.h
diff options
context:
space:
mode:
authorjoerg@trift2. <>2007-11-14 15:26:38 +0100
committerjoerg@trift2. <>2007-11-14 15:26:38 +0100
commit86674bc4129c8bf1866e8f2f5472fecb472faa62 (patch)
treec5d07cf26e05e0d323b3cd4d786ddebf85e785c5 /include/my_sys.h
parentaf7d3963b251f94b16500a87909eb12f2179be3d (diff)
parent7491e15f21f6e8dfbd29c9d4647eec5fe4abb3d2 (diff)
downloadmariadb-git-86674bc4129c8bf1866e8f2f5472fecb472faa62.tar.gz
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M50/push-5.0
Diffstat (limited to 'include/my_sys.h')
-rw-r--r--include/my_sys.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index d31ebb1f440..d1f8283947b 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -881,6 +881,8 @@ extern CHARSET_INFO *get_charset(uint cs_number, myf flags);
extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
extern CHARSET_INFO *get_charset_by_csname(const char *cs_name,
uint cs_flags, myf my_flags);
+extern CHARSET_INFO *get_compatible_charset_with_ctype(CHARSET_INFO
+ *original_cs);
extern void free_charsets(void);
extern char *get_charsets_dir(char *buf);
extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);