diff options
Diffstat (limited to 'sql/key.cc')
| -rw-r--r-- | sql/key.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/key.cc b/sql/key.cc index 809c5a164b9..37ef6339f20 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -67,7 +67,7 @@ int find_ref_key(TABLE *table,Field *field, uint *key_length) /* Copy a key from record to some buffer */ - /* if length == 0 then copy hole key */ + /* if length == 0 then copy whole key */ void key_copy(byte *key,TABLE *table,uint idx,uint key_length) { @@ -192,8 +192,10 @@ int key_cmp(TABLE *table,const byte *key,uint idx,uint key_length) if (!(key_part->key_type & (FIELDFLAG_NUMBER+FIELDFLAG_BINARY+ FIELDFLAG_PACK))) { - if (my_sortcmp((char*) key,(char*) table->record[0]+key_part->offset, - length)) + if (my_strnncoll(key_part->field->charset(), + (const uchar*) key, length, + (const uchar*) table->record[0]+key_part->offset, + length)) return 1; } else if (memcmp(key,table->record[0]+key_part->offset,length)) |