From ac44fe1f1248138dfe22b0caa50c21e4d627d394 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 22 Mar 2002 16:06:14 +0400 Subject: [PATCH] filesort.cc: Fixed that i mixed Field and Item in some cases sql/filesort.cc: Fixed that i mixed Field and Item in some cases --- sql/filesort.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sql/filesort.cc b/sql/filesort.cc index 69279040643..99eceb64703 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -470,8 +470,7 @@ static void make_sortkey(register SORTPARAM *param, switch (sort_field->result_type) { case STRING_RESULT: { - // BAR TODO: need checking that it is really Field_str based class - CHARSET_INFO *cs=((Field_str*)(sort_field->field))->charset(); + CHARSET_INFO *cs=item->str_value.charset(); if (item->maybe_null) *to++=1; @@ -947,9 +946,8 @@ sortlength(SORT_FIELD *sortorder, uint s_length) sortorder->length=sortorder->item->max_length; #ifdef USE_STRCOLL if (!sortorder->item->binary) - { - // BAR TODO: need checking that it is really Field_str based class - CHARSET_INFO *cs=((Field_str*)(sortorder->field))->charset(); + { + CHARSET_INFO *cs=sortorder->item->str_value.charset(); if (use_strcoll(cs)) sortorder->length= sortorder->length*cs->strxfrm_multiply; }