summaryrefslogtreecommitdiff
path: root/mysys/charset-def.c
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2005-04-08 13:56:48 +0200
committerunknown <joerg@mysql.com>2005-04-08 13:56:48 +0200
commitb9f486cd022dc67e5118dfdca38052c7b13c10fa (patch)
treedf8ad7b8e3c1738beeeff583617e6785687bfc00 /mysys/charset-def.c
parent0344bf166534fd56095220f06960172937746327 (diff)
downloadmariadb-git-b9f486cd022dc67e5118dfdca38052c7b13c10fa.tar.gz
Add missing parts for the "Cybozu" custom build, to avoid future manual patches.
configure.in: Normally, 'configure' does only support "case-insensitive" collations for UTF-8 character sets. However, a certain customer requires builds with a "case-sensitive" collation: 'utf8_general_cs'. In order to do custom builds without manual patches, this value gets special handling in 'configure'. Also, when it is given, the CPP symbol enabling the additional code is set. mysys/charset-def.c: Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function. strings/ctype-utf8.c: Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.
Diffstat (limited to 'mysys/charset-def.c')
-rw-r--r--mysys/charset-def.c4
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