diff options
| author | unknown <joerg@mysql.com> | 2005-04-11 11:12:08 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-04-11 11:12:08 +0200 |
| commit | 4eb5f10631806e43a08d210f079e6853435c182c (patch) | |
| tree | 660a83e8cba3eb2724bc1a64b3460228473cf709 | |
| parent | b83314e3d583f5ab884c64404679eaa81aeec24c (diff) | |
| parent | e1efe797311d05fd6360029bf3c22b47835601be (diff) | |
| download | mariadb-git-4eb5f10631806e43a08d210f079e6853435c182c.tar.gz | |
Proper handling of "utf8-general-cs" clollation: Missing parts in configuration.
configure.in:
No change here - functionality was moved to 'config/ac-macros/character_sets.m4'
mysys/charset-def.c:
Auto-merged.
strings/ctype-utf8.c:
Auto-merged.
| -rwxr-xr-x | BUILD/compile-pentium-cybozu | 9 | ||||
| -rw-r--r-- | mysys/charset-def.c | 4 | ||||
| -rw-r--r-- | strings/ctype-utf8.c | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/BUILD/compile-pentium-cybozu b/BUILD/compile-pentium-cybozu new file mode 100755 index 00000000000..841635985a1 --- /dev/null +++ b/BUILD/compile-pentium-cybozu @@ -0,0 +1,9 @@ +#! /bin/sh + +path=`dirname $0` +. "$path/SETUP.sh" + +extra_flags="$pentium_cflags $fast_cflags -g" +extra_configs="$pentium_configs --with-charset=utf8 --with-collation=utf8_general_cs" + +. "$path/FINISH.sh" diff --git a/mysys/charset-def.c b/mysys/charset-def.c index 92453aa0f59..0464ba893fb 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 @@ -159,7 +159,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 diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index e8b7a5e9e81..14b3934e815 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -2405,7 +2405,7 @@ CHARSET_INFO my_charset_utf8_bin= &my_collation_mb_bin_handler }; -#ifdef HAVE_CYBOZU_COLLATION +#ifdef HAVE_UTF8_GENERAL_CS /* * These functions bacically do the same as their original, except |