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.

1 files changed, 2 insertions, 4 deletions

diff --git a/sql/filesort.cc b/sql/filesort.cc
index 0f6e4d7abba..4c2ba1e1a59 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -505,10 +505,8 @@ static void make_sortkey(register SORTPARAM *param,
           }
           else
           {
-            if (res->ptr() != (char*) to)
-              memcpy(to,res->ptr(),length);
-            bzero((char *)to+length,diff);
-            my_tosort(cs, (char*) to,length);
+	    my_strnxfrm(cs,(uchar*)to,length,(const uchar*)res->ptr(),length);
+	    bzero((char *)to+length,diff);
           }
 	  break;
 	}