diff options
| author | bar@bar.mysql.r18.ru <> | 2002-10-09 15:40:57 +0500 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2002-10-09 15:40:57 +0500 |
| commit | 954a47b95abd9540b6436303c5ba824ea74e083b (patch) | |
| tree | 789cf07703286e15a43c1ad76c547ec3debe3a8b /isam | |
| parent | 40c0fd1c6c1305a900a678f10555ed8727c7758c (diff) | |
| download | mariadb-git-954a47b95abd9540b6436303c5ba824ea74e083b.tar.gz | |
Simple charsets now have strncoll() field too
Diffstat (limited to 'isam')
| -rw-r--r-- | isam/_key.c | 12 | ||||
| -rw-r--r-- | isam/_search.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/isam/_key.c b/isam/_key.c index 0bedb428808..002ad480c56 100644 --- a/isam/_key.c +++ b/isam/_key.c @@ -54,11 +54,11 @@ uint _nisam_make_key(register N_INFO *info, uint keynr, uchar *key, const char * *key++= (uchar) (length=(uint) (end-pos)); memcpy((byte*) key,(byte*) pos,(size_t) length); #ifdef USE_STRCOLL - if (!use_strcoll(default_charset_info)) + if (!use_strnxfrm(default_charset_info)) #endif { if (type == HA_KEYTYPE_TEXT) - case_sort(default_charset_info,(byte*) key,length); + my_tosort(default_charset_info,(byte*) key,length); } key+=length; } @@ -67,11 +67,11 @@ uint _nisam_make_key(register N_INFO *info, uint keynr, uchar *key, const char * memcpy((byte*) key,(byte*) record+keyseg->base.start, (size_t) keyseg->base.length); #ifdef USE_STRCOLL - if (!use_strcoll(default_charset_info)) + if (!use_strnxfrm(default_charset_info)) #endif { if (type == HA_KEYTYPE_TEXT) - case_sort(default_charset_info,(byte*) key,(uint) keyseg->base.length); + my_tosort(default_charset_info,(byte*) key,(uint) keyseg->base.length); } #ifdef NAN_TEST else if (type == HA_KEYTYPE_FLOAT) @@ -150,11 +150,11 @@ uint _nisam_pack_key(register N_INFO *info, uint keynr, uchar *key, uchar *old, else memcpy((byte*) key,old,(size_t) length); #ifdef USE_STRCOLL - if (!use_strcoll(default_charset_info)) + if (!use_strnxfrm(default_charset_info)) #endif { if (type == HA_KEYTYPE_TEXT) - case_sort(default_charset_info,(byte*) key,length); + my_tosort(default_charset_info,(byte*) key,length); } key+= length; } diff --git a/isam/_search.c b/isam/_search.c index d76a8ce3097..445340a21d6 100644 --- a/isam/_search.c +++ b/isam/_search.c @@ -332,7 +332,7 @@ int _nisam_key_cmp(register N_KEYSEG *keyseg, register uchar *a, register uchar end= a+ min(key_length,(uint) length); #ifdef USE_STRCOLL - if (use_strcoll(default_charset_info)) { + if (use_strnxfrm(default_charset_info)) { if (((enum ha_base_keytype) keyseg->base.type) == HA_KEYTYPE_BINARY) { while (a < end) @@ -383,7 +383,7 @@ int _nisam_key_cmp(register N_KEYSEG *keyseg, register uchar *a, register uchar else { #ifdef USE_STRCOLL - if (use_strcoll(default_charset_info)) { + if (use_strnxfrm(default_charset_info)) { if (((enum ha_base_keytype) keyseg->base.type) == HA_KEYTYPE_BINARY) { while (a < end) |