diff options
| author | unknown <bar@mysql.com> | 2005-02-18 13:21:30 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-02-18 13:21:30 +0400 |
| commit | c2e18c5061e24fcafed4bb4f58ef41b6b0a52fcc (patch) | |
| tree | 4369be6c6bd75f596b64ea29c8af74e8c4cc3e69 /mysys/charset-def.c | |
| parent | 1bdc769817bc7938efe6867f29c784c4abf55897 (diff) | |
| parent | 29fb8728e45d22241a6d225d787cd5b19e2053cb (diff) | |
| download | mariadb-git-c2e18c5061e24fcafed4bb4f58ef41b6b0a52fcc.tar.gz | |
Merge: don't add this into configure in as it is already in
config/ac-macros/character_sets.m4
mysys/charset-def.c:
Auto merged
strings/ctype-uca.c:
Auto merged
Diffstat (limited to 'mysys/charset-def.c')
| -rw-r--r-- | mysys/charset-def.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysys/charset-def.c b/mysys/charset-def.c index b8676a5d3d4..f168556e3f7 100644 --- a/mysys/charset-def.c +++ b/mysys/charset-def.c @@ -22,6 +22,8 @@ init_compiled_charsets() that only adds those that he wants */ +#ifdef HAVE_UCA_COLLATIONS + #ifdef HAVE_CHARSET_ucs2 extern CHARSET_INFO my_charset_ucs2_general_uca; extern CHARSET_INFO my_charset_ucs2_icelandic_uca_ci; @@ -62,6 +64,8 @@ extern CHARSET_INFO my_charset_utf8_roman_uca_ci; extern CHARSET_INFO my_charset_utf8_persian_uca_ci; #endif +#endif /* HAVE_UCA_COLLATIONS */ + my_bool init_compiled_charsets(myf flags __attribute__((unused))) { CHARSET_INFO *cs; @@ -123,6 +127,7 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused))) #ifdef HAVE_CHARSET_ucs2 add_compiled_collation(&my_charset_ucs2_general_ci); add_compiled_collation(&my_charset_ucs2_bin); +#ifdef HAVE_UCA_COLLATIONS add_compiled_collation(&my_charset_ucs2_general_uca); add_compiled_collation(&my_charset_ucs2_icelandic_uca_ci); add_compiled_collation(&my_charset_ucs2_latvian_uca_ci); @@ -141,6 +146,7 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused))) add_compiled_collation(&my_charset_ucs2_roman_uca_ci); add_compiled_collation(&my_charset_ucs2_persian_uca_ci); #endif +#endif #ifdef HAVE_CHARSET_ujis add_compiled_collation(&my_charset_ujis_japanese_ci); @@ -150,6 +156,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_UCA_COLLATIONS add_compiled_collation(&my_charset_utf8_general_uca_ci); add_compiled_collation(&my_charset_utf8_icelandic_uca_ci); add_compiled_collation(&my_charset_utf8_latvian_uca_ci); @@ -168,6 +175,7 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused))) add_compiled_collation(&my_charset_utf8_roman_uca_ci); add_compiled_collation(&my_charset_utf8_persian_uca_ci); #endif +#endif /* Copy compiled charsets */ for (cs=compiled_charsets; cs->name; cs++) |