diff options
Diffstat (limited to 'isam/_key.c')
| -rw-r--r-- | isam/_key.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/isam/_key.c b/isam/_key.c index c0d667cb32d..871ec82eba7 100644 --- a/isam/_key.c +++ b/isam/_key.c @@ -53,12 +53,10 @@ uint _nisam_make_key(register N_INFO *info, uint keynr, uchar *key, const char * } *key++= (uchar) (length=(uint) (end-pos)); memcpy((byte*) key,(byte*) pos,(size_t) length); -#ifdef USE_STRCOLL - if (!use_strcoll(default_charset_info)) -#endif + if (!use_strnxfrm(default_charset_info)) { if (type == HA_KEYTYPE_TEXT) - case_sort((byte*) key,length); + my_tosort(default_charset_info,(byte*) key,length); } key+=length; } @@ -66,12 +64,10 @@ uint _nisam_make_key(register N_INFO *info, uint keynr, uchar *key, const char * { memcpy((byte*) key,(byte*) record+keyseg->base.start, (size_t) keyseg->base.length); -#ifdef USE_STRCOLL - if (!use_strcoll(default_charset_info)) -#endif + if (!use_strnxfrm(default_charset_info)) { if (type == HA_KEYTYPE_TEXT) - case_sort((byte*) key,(uint) keyseg->base.length); + my_tosort(default_charset_info,(byte*) key,(uint) keyseg->base.length); } #ifdef NAN_TEST else if (type == HA_KEYTYPE_FLOAT) @@ -149,12 +145,10 @@ uint _nisam_pack_key(register N_INFO *info, uint keynr, uchar *key, uchar *old, } else memcpy((byte*) key,old,(size_t) length); -#ifdef USE_STRCOLL - if (!use_strcoll(default_charset_info)) -#endif + if (!use_strnxfrm(default_charset_info)) { if (type == HA_KEYTYPE_TEXT) - case_sort((byte*) key,length); + my_tosort(default_charset_info,(byte*) key,length); } key+= length; } |