diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-11-30 13:10:52 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-11-30 13:10:52 +0200 |
| commit | 4eb8e51c269eb9447d3765a6e4deba0dc68dfa37 (patch) | |
| tree | 8efa892fbe6bebc98ca106cf4341d406b48cb7ea /strings | |
| parent | 11815641312fdbcab26e47e4b6655c155bc39bde (diff) | |
| download | mariadb-git-4eb8e51c269eb9447d3765a6e4deba0dc68dfa37.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-tis620.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c index b6ac880dc9f..e6f6ad24eec 100644 --- a/strings/ctype-tis620.c +++ b/strings/ctype-tis620.c @@ -587,6 +587,18 @@ ret: } +static int +my_strnncollsp_nchars_tis620(CHARSET_INFO * cs, + const uchar *a, size_t a_length, + const uchar *b, size_t b_length, + size_t nchars) +{ + set_if_smaller(a_length, nchars); + set_if_smaller(b_length, nchars); + return my_strnncollsp_tis620(cs, a, a_length, b, b_length); +} + + static int my_strnncollsp_tis620_nopad(CHARSET_INFO * cs __attribute__((unused)), const uchar *a0, size_t a_length, @@ -854,7 +866,7 @@ static MY_COLLATION_HANDLER my_collation_ci_handler = NULL, /* init */ my_strnncoll_tis620, my_strnncollsp_tis620, - my_strnncollsp_nchars_generic_8bit, + my_strnncollsp_nchars_tis620, my_strnxfrm_tis620, my_strnxfrmlen_simple, my_like_range_simple, @@ -870,7 +882,7 @@ static MY_COLLATION_HANDLER my_collation_nopad_ci_handler = NULL, /* init */ my_strnncoll_tis620, my_strnncollsp_tis620_nopad, - my_strnncollsp_nchars_generic_8bit, + my_strnncollsp_nchars_tis620, my_strnxfrm_tis620_nopad, my_strnxfrmlen_simple, my_like_range_simple, |