diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-03-24 12:33:11 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-03-24 12:33:11 +0100 |
| commit | e65c4d22974170b2df977129cee04483fdabe696 (patch) | |
| tree | 8d516cfc7e94b764277dddfcac0419f317e818e6 /include/config-win.h | |
| parent | 045d42e53f2527a2fdbcef5596355f01ba8a4905 (diff) | |
| parent | f97d76ac1cf7a46d49a293da2cd4b68e903fd4ca (diff) | |
| download | mariadb-git-e65c4d22974170b2df977129cee04483fdabe696.tar.gz | |
Merge 192.168.0.100:mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
client/mysqltest.c:
Auto merged
include/config-win.h:
Auto merged
include/m_ctype.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
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
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 a7bce21b3a1..14afa38c8a7 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -422,8 +422,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" +#endif #define HAVE_SPATIAL 1 #define HAVE_RTREE_KEYS 1 @@ -435,8 +442,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 */ @@ -445,27 +454,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 |