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:
@@ -28,6 +28,7 @@
|
||||
|
||||
#include "strings_def.h"
|
||||
#include <m_ctype.h>
|
||||
#include "ctype-mb.h"
|
||||
|
||||
#ifdef HAVE_CHARSET_euckr
|
||||
|
||||
@@ -9970,7 +9971,9 @@ static MY_COLLATION_HANDLER my_collation_handler_euckr_korean_ci=
|
||||
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
|
||||
};
|
||||
|
||||
|
||||
@@ -9986,7 +9989,9 @@ static MY_COLLATION_HANDLER my_collation_handler_euckr_bin=
|
||||
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
|
||||
};
|
||||
|
||||
|
||||
@@ -10002,7 +10007,9 @@ static MY_COLLATION_HANDLER my_collation_handler_euckr_korean_nopad_ci=
|
||||
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
|
||||
};
|
||||
|
||||
|
||||
@@ -10018,7 +10025,9 @@ static MY_COLLATION_HANDLER my_collation_handler_euckr_nopad_bin=
|
||||
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