diff options
| author | unknown <joerg@mysql.com> | 2005-04-08 16:17:17 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-04-08 16:17:17 +0200 |
| commit | e1efe797311d05fd6360029bf3c22b47835601be (patch) | |
| tree | eb77fe80b057c7a634d9baf85624304ee5aa8d74 /mysys/charset-def.c | |
| parent | 20b9946d9eb8c8d6727ef38c57a869b8e9d764c2 (diff) | |
| parent | 7397aeb0500626867301e0342c0a2539019a7c90 (diff) | |
| download | mariadb-git-e1efe797311d05fd6360029bf3c22b47835601be.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
Diffstat (limited to 'mysys/charset-def.c')
| -rw-r--r-- | mysys/charset-def.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/charset-def.c b/mysys/charset-def.c index c7fa0ffd8e0..d4f69a49a2c 100644 --- a/mysys/charset-def.c +++ b/mysys/charset-def.c @@ -62,7 +62,7 @@ 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 +#ifdef HAVE_UTF8_GENERAL_CS extern CHARSET_INFO my_charset_utf8_general_cs; #endif #endif @@ -149,7 +149,7 @@ 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 +#ifdef HAVE_UTF8_GENERAL_CS add_compiled_collation(&my_charset_utf8_general_cs); #endif #ifdef HAVE_UCA_COLLATIONS |