From 5b50426f8f869b5f54d6a629e5fcac944ad6581b Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Tue, 1 Apr 2003 12:45:16 +0500
Subject: Some optimization in CHARSET_INFO:   We don't need separate
 hash_sort() and hash_caseup()   We don't need tosort(). strnxfrm will do the
 same.

---
 isam/_key.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'isam')

diff --git a/isam/_key.c b/isam/_key.c
index 871ec82eba7..65d6885869e 100644
--- a/isam/_key.c
+++ b/isam/_key.c
@@ -56,7 +56,8 @@ uint _nisam_make_key(register N_INFO *info, uint keynr, uchar *key, const char *
       if (!use_strnxfrm(default_charset_info))
       {
 	if (type == HA_KEYTYPE_TEXT)
-	  my_tosort(default_charset_info,(byte*) key,length);
+	  my_strnxfrm(default_charset_info,(uchar*) key, length,
+	  				   (uchar*) key, length);
       }
       key+=length;
     }
@@ -67,7 +68,10 @@ uint _nisam_make_key(register N_INFO *info, uint keynr, uchar *key, const char *
       if (!use_strnxfrm(default_charset_info))
       {
 	if (type == HA_KEYTYPE_TEXT)
-	  my_tosort(default_charset_info,(byte*) key,(uint) keyseg->base.length);
+	  my_strnxfrm(default_charset_info,(uchar*) key,
+	  				 (uint) keyseg->base.length,
+	  				 (uchar*) key,
+	  				 (uint) keyseg->base.length);
       }
 #ifdef NAN_TEST
       else if (type == HA_KEYTYPE_FLOAT)
@@ -148,7 +152,8 @@ uint _nisam_pack_key(register N_INFO *info, uint keynr, uchar *key, uchar *old,
       if (!use_strnxfrm(default_charset_info))
       {
 	if (type == HA_KEYTYPE_TEXT)
-	  my_tosort(default_charset_info,(byte*) key,length);
+	  my_strnxfrm(default_charset_info,(uchar*) key,length,
+	  				 (uchar*) key,length);
       }
       key+= length;
   }
-- 
cgit v1.2.1