Merge 10.6 into 10.7

1 files changed, 13 insertions, 4 deletions

diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index 8664ea3f757..79c552fd430 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -29,6 +29,7 @@
 
 #include "strings_def.h"
 #include <m_ctype.h>
+#include "ctype-mb.h"
 
 #ifdef HAVE_CHARSET_ujis
 
@@ -67252,7 +67253,9 @@ static MY_COLLATION_HANDLER my_collation_ujis_japanese_ci_handler =
     my_strcasecmp_mb,
     my_instr_mb,
     my_hash_sort_simple,
-    my_propagate_simple
+    my_propagate_simple,
+    my_min_str_mb_simple,
+    my_max_str_mb_simple
 };
 
 
@@ -67268,7 +67271,9 @@ static MY_COLLATION_HANDLER my_collation_ujis_bin_handler =
     my_strcasecmp_mb_bin,
     my_instr_mb,
     my_hash_sort_mb_bin,
-    my_propagate_simple
+    my_propagate_simple,
+    my_min_str_mb_simple,
+    my_max_str_mb_simple
 };
 
 
@@ -67284,7 +67289,9 @@ static MY_COLLATION_HANDLER my_collation_ujis_japanese_nopad_ci_handler =
     my_strcasecmp_mb,
     my_instr_mb,
     my_hash_sort_simple_nopad,
-    my_propagate_simple
+    my_propagate_simple,
+    my_min_str_mb_simple_nopad,
+    my_max_str_mb_simple
 };
 
 
@@ -67300,7 +67307,9 @@ static MY_COLLATION_HANDLER my_collation_ujis_nopad_bin_handler =
     my_strcasecmp_mb_bin,
     my_instr_mb,
     my_hash_sort_mb_nopad_bin,
-    my_propagate_simple
+    my_propagate_simple,
+    my_min_str_mb_simple_nopad,
+    my_max_str_mb_simple
 };