Commit e1efe797 authored by unknown's avatar unknown
Browse files

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/M41/mysql-4.1
parents 20b9946d 7397aeb0

BUILD/compile-pentium-cybozu

0 → 100755
+9 −0
Original line number Diff line number Diff line 
#! /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"

configure.in

+17 −10
Original line number Diff line number Diff line
@@ -2770,6 +2770,12 @@ case $default_charset in 
      ;;

    utf8)

      default_charset_default_collation="utf8_general_ci"

      if test "$default_collation" = "utf8_general_cs"; then

        # For those who explicitly desire "utf8_general_cs", support it,

        # and then also set the CPP switch enabling that code.

        UTFC="utf8_general_cs"

        AC_DEFINE([HAVE_UTF8_GENERAL_CS], [1], [certain Japanese customer])

      else

        define(UTFC1, utf8_general_ci utf8_bin)

        define(UTFC2, utf8_czech_ci utf8_danish_ci)

        define(UTFC3, utf8_estonian_ci utf8_icelandic_ci)
@@ -2780,6 +2786,7 @@ case $default_charset in 
        define(UTFC8, utf8_swedish_ci utf8_turkish_ci)

        define(UTFC9, utf8_unicode_ci)

        UTFC="UTFC1 UTFC2 UTFC3 UTFC4 UTFC5 UTFC6 UTFC7 UTFC8 UTFC9"

      fi

      default_charset_collations="$UTFC"

      ;;

    *)

mysys/charset-def.c

+2 −2
Original line number Diff line number Diff line
@@ -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

strings/ctype-utf8.c

+1 −1
Original line number Diff line number Diff line
@@ -2375,7 +2375,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