diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 09:43:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 09:43:38 +0200 |
| commit | 23f705f3a2e4125ed7026e1c9f3207088baa5fc0 (patch) | |
| tree | 83543a2d8f33ab565b258ed0064eed15ac054a3a /strings | |
| parent | 3ba8828396301e7d4ddd54188628146251cab829 (diff) | |
| parent | b3c254339be29d3be24c16fa0c150ff8ebd0bfda (diff) | |
| download | mariadb-git-23f705f3a2e4125ed7026e1c9f3207088baa5fc0.tar.gz | |
Merge 10.8 into 10.9
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 ce5e56ba542..dcbbe412ffe 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, @@ -874,7 +886,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, |