summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorsvoj@june.mysql.com <>2007-10-24 16:39:13 +0500
committersvoj@june.mysql.com <>2007-10-24 16:39:13 +0500
commit9f1d9beffab10c34bb004f9d71dbd761ccb97b7d (patch)
treea2f17b0cbc82c0391480a5670453e73dbbb531c8 /include
parent9732efe7f8970626840cf64628ab75f83eee5523 (diff)
parent0253d7875d592996b2234d211fa0d34bc7d494f8 (diff)
downloadmariadb-git-9f1d9beffab10c34bb004f9d71dbd761ccb97b7d.tar.gz
Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.0-engines
Diffstat (limited to 'include')
-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 4f7e75a836e..7218f91cccd 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -879,6 +879,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);