bk commit into 4.1 tree (joerg:1.2175)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
4.1 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2175 05/04/08 13:56:48 joerg@stripped +4 -0
  Add missing parts for the "Cybozu" custom build, to avoid future manual patches.

  BUILD/compile-pentium-cybozu
    1.1 05/04/08 13:56:05 joerg@stripped +9 -0

  strings/ctype-utf8.c
    1.84 05/04/08 13:56:05 joerg@stripped +1 -1
    Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.

  mysys/charset-def.c
    1.10 05/04/08 13:56:05 joerg@stripped +2 -2
    Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.

  configure.in
    1.357 05/04/08 13:56:05 joerg@stripped +17 -10
    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.

  BUILD/compile-pentium-cybozu
    1.0 05/04/08 13:56:05 joerg@stripped +0 -0
    BitKeeper file /M41/clone-4.1.11/BUILD/compile-pentium-cybozu

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/M41/clone-4.1.11

--- 1.356/configure.in	Tue Mar 29 19:23:21 2005
+++ 1.357/configure.in	Fri Apr  8 13:56:05 2005
@@ -2770,16 +2770,23 @@
       ;;
     utf8)
       default_charset_default_collation="utf8_general_ci"
-      define(UTFC1, utf8_general_ci utf8_bin)
-      define(UTFC2, utf8_czech_ci utf8_danish_ci)
-      define(UTFC3, utf8_estonian_ci utf8_icelandic_ci)
-      define(UTFC4, utf8_latvian_ci utf8_lithuanian_ci)
-      define(UTFC5, utf8_persian_ci utf8_polish_ci utf8_romanian_ci)
-      define(UTFC6, utf8_slovak_ci utf8_slovenian_ci)
-      define(UTFC7, utf8_spanish2_ci utf8_spanish_ci)
-      define(UTFC8, utf8_swedish_ci utf8_turkish_ci)
-      define(UTFC9, utf8_unicode_ci)
-      UTFC="UTFC1 UTFC2 UTFC3 UTFC4 UTFC5 UTFC6 UTFC7 UTFC8 UTFC9"
+      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)
+        define(UTFC4, utf8_latvian_ci utf8_lithuanian_ci)
+        define(UTFC5, utf8_persian_ci utf8_polish_ci utf8_romanian_ci)
+        define(UTFC6, utf8_slovak_ci utf8_slovenian_ci)
+        define(UTFC7, utf8_spanish2_ci utf8_spanish_ci)
+        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"
       ;;
     *)

--- 1.83/strings/ctype-utf8.c	Tue Mar 29 13:23:28 2005
+++ 1.84/strings/ctype-utf8.c	Fri Apr  8 13:56:05 2005
@@ -2375,7 +2375,7 @@
     &my_collation_mb_bin_handler
 };
 
-#ifdef HAVE_CYBOZU_COLLATION
+#ifdef HAVE_UTF8_GENERAL_CS
 
 /*
  * These functions bacically do the same as their original, except
--- New file ---
+++ BUILD/compile-pentium-cybozu	05/04/08 13:56:05
#! /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"


--- 1.9/mysys/charset-def.c	Tue Mar 29 11:48:42 2005
+++ 1.10/mysys/charset-def.c	Fri Apr  8 13:56:05 2005
@@ -62,7 +62,7 @@
 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 @@
 #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