diff options
| author | unknown <shuichi@mysql.com> | 2005-01-11 17:45:36 -0800 |
|---|---|---|
| committer | unknown <shuichi@mysql.com> | 2005-01-11 17:45:36 -0800 |
| commit | 37a15ec061b0de4d7ab287fe41cfb31bac628ffa (patch) | |
| tree | 1e4ca61358f922b77e3b88ebc606dd1f69f7e79a /config/ac-macros/character_sets.m4 | |
| parent | 8c71efbcd45fd625cfb8cd6f893642d0b69f3069 (diff) | |
| download | mariadb-git-37a15ec061b0de4d7ab287fe41cfb31bac628ffa.tar.gz | |
added new character set - cp932, eucjp_ms
config/ac-macros/character_sets.m4:
added cp932, eucjp_ms character set
include/m_ctype.h:
added cp932, eucjp_ms character set
libmysql/Makefile.shared:
added cp932, eucjp_ms character set
mysys/charset-def.c:
added cp932, eucjp_ms character set
sql/share/charsets/Index.xml:
added cp932, eucjp_ms character set
strings/Makefile.am:
added cp932, eucjp_ms character set
Diffstat (limited to 'config/ac-macros/character_sets.m4')
| -rw-r--r-- | config/ac-macros/character_sets.m4 | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/config/ac-macros/character_sets.m4 b/config/ac-macros/character_sets.m4 index 8f1d2f23715..e1e4caba1c8 100644 --- a/config/ac-macros/character_sets.m4 +++ b/config/ac-macros/character_sets.m4 @@ -7,14 +7,14 @@ AC_DIVERT_PUSH(0) define(CHARSETS_AVAILABLE0,binary) define(CHARSETS_AVAILABLE1,armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257) -define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 dec8 euckr gb2312 gbk geostd8) +define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 cp932 dec8 eucjp_ms euckr gb2312 gbk geostd8) define(CHARSETS_AVAILABLE3,greek hebrew hp8 keybcs2 koi8r koi8u) define(CHARSETS_AVAILABLE4,latin1 latin2 latin5 latin7 macce macroman) define(CHARSETS_AVAILABLE5,sjis swe7 tis620 ucs2 ujis utf8) DEFAULT_CHARSET=latin1 CHARSETS_AVAILABLE="CHARSETS_AVAILABLE0 CHARSETS_AVAILABLE1 CHARSETS_AVAILABLE2 CHARSETS_AVAILABLE3 CHARSETS_AVAILABLE4 CHARSETS_AVAILABLE5" -CHARSETS_COMPLEX="big5 cp1250 euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8" +CHARSETS_COMPLEX="big5 cp1250 cp932 eucjp_ms euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8" AC_DIVERT_POP @@ -103,9 +103,19 @@ do cp866) AC_DEFINE(HAVE_CHARSET_cp866, 1, [Define to enable charset cp866]) ;; + cp932) + AC_DEFINE(HAVE_CHARSET_cp932, 1, [Define to enable charset cp932]) + AC_DEFINE([USE_MB], 1, [Use multi-byte character routines]) + AC_DEFINE(USE_MB_IDENT, 1) + ;; dec8) AC_DEFINE(HAVE_CHARSET_dec8, 1, [Define to enable charset dec8]) ;; + eucjp_ms) + AC_DEFINE(HAVE_CHARSET_eucjp_ms, 1, [Define to enable charset eucjp_ms]) + AC_DEFINE([USE_MB], [1], [Use multi-byte character routines]) + AC_DEFINE(USE_MB_IDENT, 1) + ;; euckr) AC_DEFINE(HAVE_CHARSET_euckr, 1, [Define to enable charset euckr]) AC_DEFINE([USE_MB], [1], [Use multi-byte character routines]) @@ -241,10 +251,18 @@ case $default_charset in default_charset_default_collation="cp866_general_ci" default_charset_collations="cp866_general_ci cp866_bin" ;; + cp932) + default_charset_default_collation="cp932_japanese_ci" + default_charset_collations="cp932_japanese_ci cp932_bin" + ;; dec8) default_charset_default_collation="dec8_swedish_ci" default_charset_collations="dec8_swedish_ci dec8_bin" ;; + eucjp_ms) + default_charset_default_collation="eucjp_ms_japanese_ci" + default_charset_collations="eucjp_ms_japanese_ci ujis_bin" + ;; euckr) default_charset_default_collation="euckr_korean_ci" default_charset_collations="euckr_korean_ci euckr_bin" |