diff options
| author | unknown <bar@mysql.com> | 2005-03-29 17:24:26 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-03-29 17:24:26 +0500 |
| commit | 26ff24f0f7bba55f29e81d4fd9a923d96e669800 (patch) | |
| tree | ce2a7721b91b670467aa85de16245fb95e5ca459 /mysys/charset-def.c | |
| parent | bbd7265aa083ed0b78b3a2dae46bb7c1eb49becc (diff) | |
| parent | 0b45706c3bb5d855d1cc71cd8610a2d9c96e9547 (diff) | |
| download | mariadb-git-26ff24f0f7bba55f29e81d4fd9a923d96e669800.tar.gz | |
merge
mysys/charset-def.c:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
Auto merged
sql/mysqld.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
mysql-test/r/type_blob.result:
after merge fix
Diffstat (limited to 'mysys/charset-def.c')
| -rw-r--r-- | mysys/charset-def.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysys/charset-def.c b/mysys/charset-def.c index f168556e3f7..92453aa0f59 100644 --- a/mysys/charset-def.c +++ b/mysys/charset-def.c @@ -62,6 +62,9 @@ extern CHARSET_INFO my_charset_utf8_slovak_uca_ci; extern CHARSET_INFO my_charset_utf8_spanish2_uca_ci; extern CHARSET_INFO my_charset_utf8_roman_uca_ci; extern CHARSET_INFO my_charset_utf8_persian_uca_ci; +#ifdef HAVE_CYBOZU_COLLATION +extern CHARSET_INFO my_charset_utf8_general_cs; +#endif #endif #endif /* HAVE_UCA_COLLATIONS */ @@ -156,6 +159,9 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused))) #ifdef HAVE_CHARSET_utf8 add_compiled_collation(&my_charset_utf8_general_ci); add_compiled_collation(&my_charset_utf8_bin); +#ifdef HAVE_CYBOZU_COLLATION + add_compiled_collation(&my_charset_utf8_general_cs); +#endif #ifdef HAVE_UCA_COLLATIONS add_compiled_collation(&my_charset_utf8_general_uca_ci); add_compiled_collation(&my_charset_utf8_icelandic_uca_ci); |