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.


BUILD/compile-pentium-debug-max:
  Enable compiling of experimental collations in compile-pentium-debug-max
config/ac-macros/character_sets.m4:
  Adding hidden flag --with-experimental-collations,
  not seen in "configure --help".
strings/ctype-utf8.c:
  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

3 files changed, 20 insertions, 2 deletions

diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium-debug-max
index 7a11ad24c44..a69513ac6bb 100755
--- a/BUILD/compile-pentium-debug-max
+++ b/BUILD/compile-pentium-debug-max
@@ -6,6 +6,6 @@ path=`dirname $0`
 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"
diff --git a/config/ac-macros/character_sets.m4 b/config/ac-macros/character_sets.m4
index 1ab6e7dd780..8c3e8ca73b7 100644
--- a/config/ac-macros/character_sets.m4
+++ b/config/ac-macros/character_sets.m4
@@ -429,3 +429,16 @@ then
 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
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 0e28ff7e342..387ce16a43d 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -2764,6 +2764,7 @@ static int my_strnncoll_utf8_cs(CHARSET_INFO *cs,
   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_strnncoll_utf8_cs(CHARSET_INFO *cs,
 
 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 @@ static MY_COLLATION_HANDLER my_collation_cs_handler =
     my_strnncoll_utf8_cs,
     my_strnncollsp_utf8_cs,
     my_strnxfrm_utf8,
+    my_strnxfrmlen_utf8,
     my_like_range_simple,
     my_wildcmp_mb,
     my_strcasecmp_utf8,