mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge 10.6 into 10.7
This commit is contained in:
@@ -30,6 +30,7 @@ ctype-ujis.c file.
|
||||
|
||||
#include "strings_def.h"
|
||||
#include <m_ctype.h>
|
||||
#include "ctype-mb.h"
|
||||
|
||||
#ifdef HAVE_CHARSET_eucjpms
|
||||
|
||||
@@ -67508,7 +67509,9 @@ static MY_COLLATION_HANDLER my_collation_eucjpms_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
|
||||
};
|
||||
|
||||
|
||||
@@ -67524,7 +67527,9 @@ static MY_COLLATION_HANDLER my_collation_eucjpms_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
|
||||
};
|
||||
|
||||
|
||||
@@ -67540,7 +67545,9 @@ static MY_COLLATION_HANDLER my_collation_eucjpms_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
|
||||
};
|
||||
|
||||
|
||||
@@ -67556,7 +67563,9 @@ static MY_COLLATION_HANDLER my_collation_eucjpms_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
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user