diff options
| author | bar@mysql.com <> | 2005-03-29 14:49:33 +0500 |
|---|---|---|
| committer | bar@mysql.com <> | 2005-03-29 14:49:33 +0500 |
| commit | 396bbdbee59414b406ed9796c9c36276d185f759 (patch) | |
| tree | 801760b9d13e8d099d1cdbf2fcd3a9dde4108f6c /mysys | |
| parent | 28a02c9bd040ab6c90c7cba8c686617686517151 (diff) | |
| parent | 2d1e9862bcf230f573d99efb586afd87aa22893d (diff) | |
| download | mariadb-git-396bbdbee59414b406ed9796c9c36276d185f759.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
Diffstat (limited to 'mysys')
| -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 3278566788c..c7fa0ffd8e0 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 */ @@ -146,6 +149,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); |