diff options
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/charset.c | 2 | ||||
| -rw-r--r-- | mysys/hash.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 1c19960b197..1f8c20f45f0 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -127,7 +127,6 @@ static void simple_cs_init_functions(CHARSET_INFO *cs) cs->strnncoll = b->strnncoll; cs->strnncollsp = b->strnncollsp; cs->strcasecmp = b->strcasecmp; - cs->strncasecmp = b->strncasecmp; cs->hash_sort = b->hash_sort; } else @@ -138,7 +137,6 @@ static void simple_cs_init_functions(CHARSET_INFO *cs) cs->strnncoll = my_strnncoll_simple; cs->strnncollsp = my_strnncollsp_simple; cs->strcasecmp = my_strcasecmp_8bit; - cs->strncasecmp = my_strncasecmp_8bit; cs->hash_sort = my_hash_sort_simple; } diff --git a/mysys/hash.c b/mysys/hash.c index abff6694af9..9169613c39f 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -211,7 +211,7 @@ static int hashcmp(HASH *hash,HASH_LINK *pos,const byte *key,uint length) uint rec_keylength; byte *rec_key= (byte*) hash_key(hash,pos->data,&rec_keylength,1); return (length && length != rec_keylength) || - my_strncasecmp(hash->charset, rec_key,key,rec_keylength); + my_strnncoll(hash->charset, rec_key, rec_keylength, key, length); } |