summaryrefslogtreecommitdiff
path: root/include/my_sys.h
diff options
context:
space:
mode:
authorsvoj@mysql.com/june.mysql.com <>2007-10-24 16:10:09 +0500
committersvoj@mysql.com/june.mysql.com <>2007-10-24 16:10:09 +0500
commit0253d7875d592996b2234d211fa0d34bc7d494f8 (patch)
treef9707f2f5c4539922aa671f1d53db13691b51069 /include/my_sys.h
parent8619e7df83e0bf175ac7f184e48c9d5beef91b99 (diff)
parent5d1ccce58ac10b2abff245734cd8e3f5ed2e9f67 (diff)
downloadmariadb-git-0253d7875d592996b2234d211fa0d34bc7d494f8.tar.gz
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines
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 759531fa649..4a0586b9f2d 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -784,6 +784,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);