diff options
| author | unknown <kent@mysql.com> | 2006-03-23 17:41:53 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-03-23 17:41:53 +0100 |
| commit | 145e4258e56c9bb02f19ff69054daa3fe3d6772c (patch) | |
| tree | 547b875a3ae8d8ec33a461463d6b346af5598ca3 /include/config-win.h | |
| parent | de752e89ea3dccf2d02c4e51418fb51792fd978a (diff) | |
| parent | 5aa14b983277d45ca55bea8f5fcdf5229f054bec (diff) | |
| download | mariadb-git-145e4258e56c9bb02f19ff69054daa3fe3d6772c.tar.gz | |
Merge
include/m_ctype.h:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
include/config-win.h:
SCCS merged
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/config-win.h b/include/config-win.h index 6dbfae1716e..d335ad38feb 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -407,8 +407,15 @@ inline double ulonglong2double(ulonglong value) #define shared_memory_buffer_length 16000 #define default_shared_memory_base_name "MYSQL" + +#ifdef CYBOZU +#define MYSQL_DEFAULT_CHARSET_NAME "utf8" +#define MYSQL_DEFAULT_COLLATION_NAME "utf8_general_cs" +#define HAVE_UTF8_GENERAL_CS 1 +#else #define MYSQL_DEFAULT_CHARSET_NAME "latin1" #define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci" +#enfif #define HAVE_SPATIAL 1 #define HAVE_RTREE_KEYS 1 @@ -419,8 +426,10 @@ inline double ulonglong2double(ulonglong value) /* Define charsets you want */ /* #undef HAVE_CHARSET_armscii8 */ /* #undef HAVE_CHARSET_ascii */ +#ifndef CYBOZU #define HAVE_CHARSET_big5 1 #define HAVE_CHARSET_cp1250 1 +#endif /* #undef HAVE_CHARSET_cp1251 */ /* #undef HAVE_CHARSET_cp1256 */ /* #undef HAVE_CHARSET_cp1257 */ @@ -429,27 +438,33 @@ inline double ulonglong2double(ulonglong value) /* #undef HAVE_CHARSET_cp866 */ #define HAVE_CHARSET_cp932 1 /* #undef HAVE_CHARSET_dec8 */ +#ifndef CYBOZU #define HAVE_CHARSET_eucjpms 1 #define HAVE_CHARSET_euckr 1 #define HAVE_CHARSET_gb2312 1 #define HAVE_CHARSET_gbk 1 +#endif /* #undef HAVE_CHARSET_greek */ /* #undef HAVE_CHARSET_hebrew */ /* #undef HAVE_CHARSET_hp8 */ /* #undef HAVE_CHARSET_keybcs2 */ /* #undef HAVE_CHARSET_koi8r */ /* #undef HAVE_CHARSET_koi8u */ +#ifndef CYBOZU #define HAVE_CHARSET_latin1 1 #define HAVE_CHARSET_latin2 1 +#endif /* #undef HAVE_CHARSET_latin5 */ /* #undef HAVE_CHARSET_latin7 */ /* #undef HAVE_CHARSET_macce */ /* #undef HAVE_CHARSET_macroman */ #define HAVE_CHARSET_sjis 1 /* #undef HAVE_CHARSET_swe7 */ +#ifndef CYBOZU #define HAVE_CHARSET_tis620 1 #define HAVE_CHARSET_ucs2 1 #define HAVE_CHARSET_ujis 1 +#endif #define HAVE_CHARSET_utf8 1 #define HAVE_UCA_COLLATIONS 1 |