diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2002-12-20 17:14:46 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2002-12-20 17:14:46 +0400 |
| commit | 54abb8e922dcdb0834e29f7de76ec849f258e06c (patch) | |
| tree | 32f5ef505dc3713cbcfdf84d6a2b51f0f3bc020f /sql/filesort.cc | |
| parent | f6d3338a9115fdbd8fb9d504adf0e505fa22ae8a (diff) | |
| download | mariadb-git-54abb8e922dcdb0834e29f7de76ec849f258e06c.tar.gz | |
less default_charset_info
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |