diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-03-31 11:04:48 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-03-31 11:04:48 +0400 |
| commit | 1d73005bf357a607423f858482c52ecb4712607d (patch) | |
| tree | 974a3bbb7f8ee2ef7c0b15aa16aed03baa18926a /unittest | |
| parent | 282497dd6d1049b4fb963641504c2733752845a7 (diff) | |
| download | mariadb-git-1d73005bf357a607423f858482c52ecb4712607d.tar.gz | |
MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_difference
- Removing the "diff_if_only_endspace_difference" argument from
MY_COLLATION_HANDLER::strnncollsp(), my_strnncollsp_simple(),
as well as in the function template MY_FUNCTION_NAME(strnncollsp)
in strcoll.ic
- Removing the "diff_if_only_space_different" from ha_compare_text(),
hp_rec_key_cmp().
- Adding a new function my_strnncollsp_padspace_bin() and reusing
it instead of duplicate code pieces in my_strnncollsp_8bit_bin(),
my_strnncollsp_latin1_de(), my_strnncollsp_tis620(),
my_strnncollsp_utf8_cs().
- Adding more tests for better coverage of the trailing space handling.
- Removing the unused definition of HA_END_SPACE_ARE_EQUAL
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/strings/strings-t.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unittest/strings/strings-t.c b/unittest/strings/strings-t.c index fe595a5c303..22b50fc1659 100644 --- a/unittest/strings/strings-t.c +++ b/unittest/strings/strings-t.c @@ -627,7 +627,7 @@ strcollsp(CHARSET_INFO *cs, const STRNNCOLL_PARAM *param) { char ahex[64], bhex[64]; int res= cs->coll->strnncollsp(cs, (uchar *) p->a, p->alen, - (uchar *) p->b, p->blen, 0); + (uchar *) p->b, p->blen); str2hex(ahex, sizeof(ahex), p->a, p->alen); str2hex(bhex, sizeof(bhex), p->b, p->blen); diag("%-20s %-10s %-10s %10d %10d%s", @@ -641,7 +641,7 @@ strcollsp(CHARSET_INFO *cs, const STRNNCOLL_PARAM *param) { /* Test in reverse order */ res= cs->coll->strnncollsp(cs, (uchar *) p->b, p->blen, - (uchar *) p->a, p->alen, 0); + (uchar *) p->a, p->alen); if (!eqres(res, -p->res)) { diag("Comparison in reverse order failed. Expected %d, got %d", |