summaryrefslogtreecommitdiff
path: root/heap
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2002-10-10 17:14:56 +0500
committerunknown <bar@bar.mysql.r18.ru>2002-10-10 17:14:56 +0500
commit23aa0b72de59087beb1588f63eed4add1f02806a (patch)
treef3903780ba0e86bebf8e27358f4e75626afdd495 /heap
parentab9ea7cf9975e96657b4b38790c4dc4c6515d8af (diff)
downloadmariadb-git-23aa0b72de59087beb1588f63eed4add1f02806a.tar.gz
Don't use sort_order directly
Diffstat (limited to 'heap')
-rw-r--r--heap/hp_hash.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/heap/hp_hash.c b/heap/hp_hash.c
index ea48bd0c947..e28f4725caf 100644
--- a/heap/hp_hash.c
+++ b/heap/hp_hash.c
@@ -301,11 +301,7 @@ ulong hp_hashnr(register HP_KEYDEF *keydef, register const byte *key)
}
if (seg->type == HA_KEYTYPE_TEXT)
{
- for (; pos < (uchar*) key ; pos++)
- {
- nr *=16777619;
- nr ^=((uint) my_sort_order[(uint) *pos]);
- }
+ seg->charset->hash_sort(seg->charset,pos,((uchar*)key)-pos,&nr,NULL);
}
else
{
@@ -339,11 +335,7 @@ ulong hp_rec_hashnr(register HP_KEYDEF *keydef, register const byte *rec)
}
if (seg->type == HA_KEYTYPE_TEXT)
{
- for ( ; pos < end ; pos++)
- {
- nr *=16777619;
- nr ^=(uint) my_sort_order[(uint) *pos];
- }
+ seg->charset->hash_sort(seg->charset,pos,((uchar*)key)-pos,&nr,NULL);
}
else
{