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 /storage/innobase | |
| 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 'storage/innobase')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 5edb6dc5190..150f21ad8ae 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -6339,7 +6339,7 @@ innobase_mysql_cmp( having indexes on such data need to rebuild their tables! */ ret = charset->coll->strnncollsp( - charset, a, a_length, b, b_length, 0); + charset, a, a_length, b, b_length); if (ret < 0) { return(-1); @@ -6433,7 +6433,7 @@ innobase_mysql_cmp_prefix( charset = innobase_get_fts_charset(mysql_type, charset_number); result = ha_compare_text(charset, (uchar*) a, a_length, - (uchar*) b, b_length, 1, 0); + (uchar*) b, b_length, 1); return(result); } @@ -6453,7 +6453,7 @@ innobase_fts_text_cmp( return(ha_compare_text( charset, s1->f_str, static_cast<uint>(s1->f_len), - s2->f_str, static_cast<uint>(s2->f_len), 0, 0)); + s2->f_str, static_cast<uint>(s2->f_len), 0)); } /******************************************************************//** compare two character string case insensitively according to their charset. */ @@ -6476,7 +6476,7 @@ innobase_fts_text_case_cmp( return(ha_compare_text( charset, s1->f_str, static_cast<uint>(s1->f_len), - s2->f_str, static_cast<uint>(newlen), 0, 0)); + s2->f_str, static_cast<uint>(newlen), 0)); } /******************************************************************//** Get the first character's code position for FTS index partition. */ @@ -6524,7 +6524,7 @@ innobase_fts_text_cmp_prefix( result = ha_compare_text( charset, s2->f_str, static_cast<uint>(s2->f_len), - s1->f_str, static_cast<uint>(s1->f_len), 1, 0); + s1->f_str, static_cast<uint>(s1->f_len), 1); /* We switched s1, s2 position in ha_compare_text. So we need to negate the result */ |