summaryrefslogtreecommitdiff
path: root/isam/_key.c
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-01-30 11:15:14 +0400
committerunknown <bar@bar.mysql.r18.ru>2003-01-30 11:15:14 +0400
commit7ae7275c9c086c4d2eb61f17bce0a8a6ea4c5ef9 (patch)
tree4bf943936ae0609c73eb4b1d0aa5a8bf1ce6d00a /isam/_key.c
parenta2ccd6f0fe5bd7cc863ad60df95a16a178d677aa (diff)
downloadmariadb-git-7ae7275c9c086c4d2eb61f17bce0a8a6ea4c5ef9.tar.gz
Always use USE_STRCOLL code
Diffstat (limited to 'isam/_key.c')
-rw-r--r--isam/_key.c6
1 files changed, 0 insertions, 6 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);