summaryrefslogtreecommitdiff
path: root/sql/key.cc
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2002-12-20 17:14:46 +0400
committerunknown <bar@bar.mysql.r18.ru>2002-12-20 17:14:46 +0400
commita2a99eb5d981d7ed0bc24b9bb84d95ae518d898c (patch)
tree32f5ef505dc3713cbcfdf84d6a2b51f0f3bc020f /sql/key.cc
parent3e7d0c79f9ec6fc00edaca9a2d6d1ceae11fcb05 (diff)
downloadmariadb-git-a2a99eb5d981d7ed0bc24b9bb84d95ae518d898c.tar.gz
less default_charset_info
Diffstat (limited to 'sql/key.cc')
-rw-r--r--sql/key.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/key.cc b/sql/key.cc
index 84669808b92..875a89a146f 100644
--- a/sql/key.cc
+++ b/sql/key.cc
@@ -192,8 +192,7 @@ int key_cmp(TABLE *table,const byte *key,uint idx,uint key_length)
if (!(key_part->key_type & (FIELDFLAG_NUMBER+FIELDFLAG_BINARY+
FIELDFLAG_PACK)))
{
- /* BAR TODO: I'm not sure this should be system_charset_info */
- if (my_strnncoll(system_charset_info,
+ if (my_strnncoll(key_part->field->charset(),
(const uchar*) key, length,
(const uchar*) table->record[0]+key_part->offset,length))
return 1;