summaryrefslogtreecommitdiff
path: root/mysys/charset-def.c
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2005-03-29 14:48:47 +0500
committerunknown <bar@mysql.com>2005-03-29 14:48:47 +0500
commit13b47b5e4340169906698054a27ac91bc76d6211 (patch)
tree88f3eea2020d465ae12a0e6cab9f2e66b71d24b4 /mysys/charset-def.c
parent5fb5282784c2d3fabb504367c1114282a65bbee8 (diff)
downloadmariadb-git-13b47b5e4340169906698054a27ac91bc76d6211.tar.gz
Adding Cybozu's patch.
Not active by default. One need to pass -DHAVE_CYBOZU_COLLATION to activate it. mysys/charset-def.c: Adding Cybozu's patch. Not active by default. strings/ctype-utf8.c: Adding Cybozu's patch. Not active by default.
Diffstat (limited to 'mysys/charset-def.c')
-rw-r--r--mysys/charset-def.c6
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);