summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <rburnett@bk-internal.mysql.com>2005-05-06 15:10:01 +0200
committerunknown <rburnett@bk-internal.mysql.com>2005-05-06 15:10:01 +0200
commit6b819860e5fa83f1ba7c6025df8e227775bb1a1b (patch)
treec71943143e5639720df1bbb12f68ad2be6f17428 /include
parent779ac9cf9e92deb2e3a9d55e3718b7f069998726 (diff)
parent9b2078d5a05e0578471b680eb79cbf4ba20c0950 (diff)
downloadmariadb-git-6b819860e5fa83f1ba7c6025df8e227775bb1a1b.tar.gz
Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/users/rburnett/bug9721 BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'include')
-rw-r--r--include/m_ctype.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h
index aab39156de1..ab63a1e0db1 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -230,6 +230,8 @@ typedef struct charset_info_st
extern CHARSET_INFO my_charset_bin;
extern CHARSET_INFO my_charset_big5_chinese_ci;
extern CHARSET_INFO my_charset_big5_bin;
+extern CHARSET_INFO my_charset_cp932_japanese_ci;
+extern CHARSET_INFO my_charset_cp932_bin;
extern CHARSET_INFO my_charset_euckr_korean_ci;
extern CHARSET_INFO my_charset_euckr_bin;
extern CHARSET_INFO my_charset_gb2312_chinese_ci;