diff options
| author | bar@bar.mysql.r18.ru <> | 2002-10-10 17:14:56 +0500 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2002-10-10 17:14:56 +0500 |
| commit | 69dc5ef8f62347000c0bd241660bfdbe7e3dd142 (patch) | |
| tree | f3903780ba0e86bebf8e27358f4e75626afdd495 /heap | |
| parent | a0dd5febfcdb93247df45f3d0d6f674dda59311c (diff) | |
| download | mariadb-git-69dc5ef8f62347000c0bd241660bfdbe7e3dd142.tar.gz | |
Don't use sort_order directly
Diffstat (limited to 'heap')
| -rw-r--r-- | heap/hp_hash.c | 12 |
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 { |