From 6bcc515739c9a31c24bc2396c94b8b1418b20c05 Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Fri, 20 Dec 2002 17:14:46 +0400
Subject: less default_charset_info

---
 sql/filesort.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql/filesort.cc')

diff --git a/sql/filesort.cc b/sql/filesort.cc
index 97e06997617..8b55a2f4aa1 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -470,10 +470,11 @@ static void make_sortkey(register SORTPARAM *param,
       switch (sort_field->result_type) {
       case STRING_RESULT:
 	{
+          CHARSET_INFO *cs=item->charset();
 	  if (item->maybe_null)
 	    *to++=1;
 	  /* All item->str() to use some extra byte for end null.. */
-	  String tmp((char*) to,sort_field->length+4,default_charset_info);
+	  String tmp((char*) to,sort_field->length+4,cs);
 	  String *res=item->val_str(&tmp);
 	  if (!res)
 	  {
@@ -488,7 +489,6 @@ static void make_sortkey(register SORTPARAM *param,
 	    break;
 	  }
 	  length=res->length();
-	  CHARSET_INFO *cs=res->charset();
 	  int diff=(int) (sort_field->length-length);
 	  if (diff < 0)
 	  {
-- 
cgit v1.2.1


From fe9e13905649a41bcda1ab4d749a31695b89b870 Mon Sep 17 00:00:00 2001
From: "bell@sanja.is.com.ua" <>
Date: Sat, 28 Dec 2002 01:01:05 +0200
Subject: postreview fix (SCRUM) fixed layout

---
 sql/filesort.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/filesort.cc')

diff --git a/sql/filesort.cc b/sql/filesort.cc
index 8b55a2f4aa1..00ef12839cf 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -496,7 +496,7 @@ static void make_sortkey(register SORTPARAM *param,
 	    length=sort_field->length;
 	  }
 #ifdef USE_STRCOLL
-          if(use_strnxfrm(cs))
+          if (use_strnxfrm(cs))
           {
             if (item->binary())
             {
-- 
cgit v1.2.1