bk commit into 5.0 tree (bar:1.2477) BUG#22378

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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.2477 07/03/27 15:06:41 bar@stripped +3 -0
  Bug#22378 Make error, strings/ctype-utf8.c, uni_plane undeclared
  - Fixing utf8_general_cs according to recent changes.
  - Compiling utf8_general_cs in pentium-debug-max configuration
    to avoid these problems in the future.

  strings/ctype-utf8.c
    1.106 07/03/27 15:06:38 bar@stripped +6 -1
    Compilation failure changes:
    catching up with previous character set changes:
    - uni_plane is now not a global variables
    - adding new parameter into my_strnncollsp_utf8_cs
    - adding my_strnxfrm_len into MY_COLLATION_HANDLER 
      for utf8_general_cs

  config/ac-macros/character_sets.m4
    1.9 07/03/27 15:06:38 bar@stripped +13 -0
    Adding hidden flag --with-experimental-collations,
    not seen in "configure --help".

  BUILD/compile-pentium-debug-max
    1.18 07/03/27 15:06:38 bar@stripped +1 -1
    Enable compiling of experimental collations in compile-pentium-debug-max

# 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:	bar
# Host:	bar.myoffice.izhnet.ru
# Root:	/home/bar/mysql-5.0.b22378

--- 1.105/strings/ctype-utf8.c	2007-02-22 18:59:55 +04:00
+++ 1.106/strings/ctype-utf8.c	2007-03-27 15:06:38 +05:00
@@ -2764,6 +2764,7 @@
   const uchar *te=t+tlen;
   int save_diff = 0;
   int diff;
+  MY_UNICASE_INFO **uni_plane= cs->caseinfo;
 
   while ( s < se && t < te )
   {
@@ -2800,13 +2801,16 @@
 
 static int my_strnncollsp_utf8_cs(CHARSET_INFO *cs, 
                                   const uchar *s, uint slen,
-                                  const uchar *t, uint tlen)
+                                  const uchar *t, uint tlen,
+                                  my_bool diff_if_only_endspace_difference
+                                  __attribute__((unused)))
 {
   int s_res,t_res;
   my_wc_t s_wc,t_wc;
   const uchar *se= s+slen;
   const uchar *te= t+tlen;
   int save_diff = 0;
+  MY_UNICASE_INFO **uni_plane= cs->caseinfo;
   
   while ( s < se && t < te )
   {
@@ -2875,6 +2879,7 @@
     my_strnncoll_utf8_cs,
     my_strnncollsp_utf8_cs,
     my_strnxfrm_utf8,
+    my_strnxfrmlen_utf8,
     my_like_range_simple,
     my_wildcmp_mb,
     my_strcasecmp_utf8,

--- 1.8/config/ac-macros/character_sets.m4	2005-09-12 19:35:24 +05:00
+++ 1.9/config/ac-macros/character_sets.m4	2007-03-27 15:06:38 +05:00
@@ -429,3 +429,16 @@
 else
   AC_MSG_RESULT(no)
 fi
+
+
+# Shall we build experimental collations
+AC_ARG_WITH(experimental-collations,
+    [],
+    [with_exp_coll=$withval],
+    [with_exp_coll=no]
+)
+
+if test "$with_exp_coll" = "yes"
+then
+  AC_DEFINE([HAVE_UTF8_GENERAL_CS], [1], [certain Japanese customer])
+fi

--- 1.17/BUILD/compile-pentium-debug-max	2005-02-05 18:05:42 +04:00
+++ 1.18/BUILD/compile-pentium-debug-max	2007-03-27 15:06:38 +05:00
@@ -6,6 +6,6 @@
 extra_flags="$pentium_cflags $debug_cflags $max_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs $max_configs"
+extra_configs="$pentium_configs $debug_configs $max_configs --with-experimental-collations"
 
 . "$path/FINISH.sh"