diff options
Diffstat (limited to 'isam')
| -rw-r--r-- | isam/_key.c | 6 | ||||
| -rw-r--r-- | isam/_search.c | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/isam/_key.c b/isam/_key.c index 002ad480c56..871ec82eba7 100644 --- a/isam/_key.c +++ b/isam/_key.c @@ -53,9 +53,7 @@ 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_strnxfrm(default_charset_info)) -#endif { if (type == HA_KEYTYPE_TEXT) my_tosort(default_charset_info,(byte*) key,length); @@ -66,9 +64,7 @@ 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_strnxfrm(default_charset_info)) -#endif { if (type == HA_KEYTYPE_TEXT) my_tosort(default_charset_info,(byte*) key,(uint) keyseg->base.length); @@ -149,9 +145,7 @@ 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_strnxfrm(default_charset_info)) -#endif { if (type == HA_KEYTYPE_TEXT) my_tosort(default_charset_info,(byte*) key,length); diff --git a/isam/_search.c b/isam/_search.c index d5e145ae0bf..1ceeab1e824 100644 --- a/isam/_search.c +++ b/isam/_search.c @@ -331,7 +331,6 @@ int _nisam_key_cmp(register N_KEYSEG *keyseg, register uchar *a, register uchar (int) *as : b_length; end= a+ min(key_length,(uint) length); -#ifdef USE_STRCOLL if (use_strnxfrm(default_charset_info)) { if (((enum ha_base_keytype) keyseg->base.type) == HA_KEYTYPE_BINARY) { @@ -349,7 +348,6 @@ int _nisam_key_cmp(register N_KEYSEG *keyseg, register uchar *a, register uchar } } else -#endif { while (a < end) if ((flag= (int) *a++ - (int) *b++)) @@ -382,7 +380,6 @@ int _nisam_key_cmp(register N_KEYSEG *keyseg, register uchar *a, register uchar } else { -#ifdef USE_STRCOLL if (use_strnxfrm(default_charset_info)) { if (((enum ha_base_keytype) keyseg->base.type) == HA_KEYTYPE_BINARY) { @@ -400,7 +397,6 @@ int _nisam_key_cmp(register N_KEYSEG *keyseg, register uchar *a, register uchar } } else -#endif { while (a < end) if ((flag= (int) *a++ - (int) *b++)) |