diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 10:00:52 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 10:00:52 +0200 |
| commit | 64071d30bdbf2ba4e09935786ccb9337c8faf77c (patch) | |
| tree | 153d4160c66f121f11741a5cdd9cf18d0d2051ea /strings | |
| parent | 922f7ba75c864a9ae4d0e55fa66860dae306136f (diff) | |
| parent | 3ff4eb07edfd41a61d8283b59c35a29637297b3c (diff) | |
| download | mariadb-git-64071d30bdbf2ba4e09935786ccb9337c8faf77c.tar.gz | |
Merge 10.10 into 10.11
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 256736f3e29..4c75a7cf60a 100644 --- a/strings/ctype-tis620.c +++ b/strings/ctype-tis620.c @@ -589,6 +589,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, @@ -856,7 +868,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, @@ -876,7 +888,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, |