MDEV-8215 Asian MB3 charsets: compare broken bytes as "greater than any non-broken character"

1 files changed, 40 insertions, 5 deletions

diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index cb000a2afa0..497ad67da05 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -193,6 +193,7 @@ static const uchar sort_order_ujis[]=
 #define isujis_ss3(c)         ((uchar) (c) == 0x8f)
 
 #define MY_FUNCTION_NAME(x)   my_ ## x ## _ujis
+#define IS_MB1_CHAR(x)        ((uchar) (x) < 0x80)
 #define IS_MB2_JIS(x,y)       (isujis(x)        && isujis(y))
 #define IS_MB2_KATA(x,y)      (isujis_ss2(x)    && iskata(y))
 #define IS_MB2_CHAR(x, y)     (IS_MB2_KATA(x,y) || IS_MB2_JIS(x,y))
@@ -200,6 +201,23 @@ static const uchar sort_order_ujis[]=
 #define DEFINE_ASIAN_ROUTINES
 #include "ctype-mb.ic"
 
+#define MY_FUNCTION_NAME(x)  my_ ## x ## _ujis_japanese_ci
+#define WEIGHT_ILSEQ(x)      (0xFF0000 + (uchar) (x))
+#define WEIGHT_MB1(x)        ((int) sort_order_ujis[(uchar) (x)])
+#define WEIGHT_MB2(x,y)      ((((uint) (uchar)(x)) << 16) | \
+                             (((uint) (uchar) (y)) <<  8))
+#define WEIGHT_MB3(x,y,z)    (WEIGHT_MB2(x,y) | ((uint) (uchar) z))
+#include "strcoll.ic"
+
+
+#define MY_FUNCTION_NAME(x)  my_ ## x ## _ujis_bin
+#define WEIGHT_ILSEQ(x)      (0xFF0000 + (uchar) (x))
+#define WEIGHT_MB1(x)        ((int) (uchar) (x))
+#define WEIGHT_MB2(x,y)      ((((uint) (uchar)(x)) << 16) | \
+                             (((uint) (uchar) (y)) <<  8))
+#define WEIGHT_MB3(x,y,z)    (WEIGHT_MB2(x,y) | ((uint) (uchar) z))
+#include "strcoll.ic"
+
 
 static uint ismbchar_ujis(CHARSET_INFO *cs __attribute__((unused)),
 		  const char* p, const char *e)
@@ -67211,11 +67229,11 @@ my_caseup_ujis(CHARSET_INFO * cs, char *src, size_t srclen,
 
 #ifdef HAVE_CHARSET_ujis
 
-static MY_COLLATION_HANDLER my_collation_ci_handler =
+static MY_COLLATION_HANDLER my_collation_ujis_japanese_ci_handler =
 {
     NULL,		/* init */
-    my_strnncoll_simple,/* strnncoll    */
-    my_strnncollsp_simple,
+    my_strnncoll_ujis_japanese_ci,
+    my_strnncollsp_ujis_japanese_ci,
     my_strnxfrm_mb,     /* strnxfrm     */
     my_strnxfrmlen_simple,
     my_like_range_mb,   /* like_range   */
@@ -67226,6 +67244,23 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
     my_propagate_simple
 };
 
+
+static MY_COLLATION_HANDLER my_collation_ujis_bin_handler =
+{
+    NULL,                    /* init */
+    my_strnncoll_ujis_bin,
+    my_strnncollsp_ujis_bin,
+    my_strnxfrm_mb,
+    my_strnxfrmlen_simple,
+    my_like_range_mb,
+    my_wildcmp_mb_bin,
+    my_strcasecmp_mb_bin,
+    my_instr_mb,
+    my_hash_sort_mb_bin,
+    my_propagate_simple
+};
+
+
 static MY_CHARSET_HANDLER my_charset_handler=
 {
     NULL,		/* init */
@@ -67291,7 +67326,7 @@ struct charset_info_st my_charset_ujis_japanese_ci=
     0,                  /* escape_with_backslash_is_dangerous */
     1,                  /* levels_for_order   */
     &my_charset_handler,
-    &my_collation_ci_handler
+    &my_collation_ujis_japanese_ci_handler
 };
 
 
@@ -67324,7 +67359,7 @@ struct charset_info_st my_charset_ujis_bin=
     0,                  /* escape_with_backslash_is_dangerous */
     1,                  /* levels_for_order   */
     &my_charset_handler,
-    &my_collation_mb_bin_handler
+    &my_collation_ujis_bin_handler
 };