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 /include/my_base.h | |
| 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 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/my_base.h b/include/my_base.h index 8b546edac43..1317639c528 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -298,11 +298,7 @@ enum ha_base_keytype { #define HA_SWAP_KEY 64 #define HA_REVERSE_SORT 128 /* Sort key in reverse order */ #define HA_NO_SORT 256 /* do not bother sorting on this keyseg */ -/* - End space in unique/varchar are considered equal. (Like 'a' and 'a ') - Only needed for internal temporary tables. -*/ -#define HA_END_SPACE_ARE_EQUAL 512 + #define HA_BIT_PART 1024 #define HA_CAN_MEMCMP 2048 /* internal, never stored in frm */ |