diff options
author | Alexander Barkov <bar@mariadb.org> | 2015-06-26 13:40:28 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2015-06-26 13:40:28 +0400 |
commit | 4f828a1cac9a9c378a2a9f3c3ef0710eaf11ce02 (patch) | |
tree | f4da132264de74b64df5035bfec50c2bb80d987b /strings/ctype-euc_kr.c | |
parent | d535728165acb2eb55140bb70fa44c458d1ccc06 (diff) | |
download | mariadb-git-4f828a1cac9a9c378a2a9f3c3ef0710eaf11ce02.tar.gz |
MDEV-8214 Asian MB2 charsets: compare broken bytes as "greater than any non-broken character"
Diffstat (limited to 'strings/ctype-euc_kr.c')
-rw-r--r-- | strings/ctype-euc_kr.c | 49 |
1 files changed, 40 insertions, 9 deletions
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c index a2c95bf77c8..f4d4b445bb2 100644 --- a/strings/ctype-euc_kr.c +++ b/strings/ctype-euc_kr.c @@ -201,8 +201,10 @@ static const uchar sort_order_euc_kr[]= iseuc_kr_tail2(c) || \ iseuc_kr_tail3(c)) +#define euckrcode(c,d) (((uchar)(c) <<8) | (uchar)(d)) #define MY_FUNCTION_NAME(x) my_ ## x ## _euckr +#define IS_MB1_CHAR(x) ((uchar) (x) < 0x80) #define IS_MB2_CHAR(x,y) (iseuc_kr_head(x) && iseuc_kr_tail(y)) #define DEFINE_ASIAN_ROUTINES #include "ctype-mb.ic" @@ -9938,21 +9940,50 @@ my_mb_wc_euc_kr(CHARSET_INFO *cs __attribute__((unused)), } -static MY_COLLATION_HANDLER my_collation_ci_handler = +#define MY_FUNCTION_NAME(x) my_ ## x ## _euckr_korean_ci +#define WEIGHT_MB1(x) (sort_order_euc_kr[(uchar) (x)]) +#define WEIGHT_MB2(x,y) (euckrcode(x, y)) +#include "strcoll.ic" + + +#define MY_FUNCTION_NAME(x) my_ ## x ## _euckr_bin +#define WEIGHT_MB1(x) ((uchar) (x)) +#define WEIGHT_MB2(x,y) (euckrcode(x, y)) +#include "strcoll.ic" + + +static MY_COLLATION_HANDLER my_collation_handler_euckr_korean_ci= { - NULL, /* init */ - my_strnncoll_simple, /* strnncoll */ - my_strnncollsp_simple, - my_strnxfrm_mb, /* strnxfrm */ + NULL, /* init */ + my_strnncoll_euckr_korean_ci, + my_strnncollsp_euckr_korean_ci, + my_strnxfrm_mb, my_strnxfrmlen_simple, - my_like_range_mb, /* like_range */ - my_wildcmp_mb, /* wildcmp */ + my_like_range_mb, + my_wildcmp_mb, my_strcasecmp_mb, my_instr_mb, my_hash_sort_simple, my_propagate_simple }; + +static MY_COLLATION_HANDLER my_collation_handler_euckr_bin= +{ + NULL, /* init */ + my_strnncoll_euckr_bin, + my_strnncollsp_euckr_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 */ @@ -10017,7 +10048,7 @@ struct charset_info_st my_charset_euckr_korean_ci= 0, /* escape_with_backslash_is_dangerous */ 1, /* levels_for_order */ &my_charset_handler, - &my_collation_ci_handler + &my_collation_handler_euckr_korean_ci }; @@ -10050,7 +10081,7 @@ struct charset_info_st my_charset_euckr_bin= 0, /* escape_with_backslash_is_dangerous */ 1, /* levels_for_order */ &my_charset_handler, - &my_collation_mb_bin_handler + &my_collation_handler_euckr_bin }; #endif |