mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

filesort.cc:

Browse source 
Fixed that i mixed Field and Item in some cases


sql/filesort.cc:
  Fixed that i mixed Field and Item in some cases
This commit is contained in:
unknown 2002-03-22 16:06:14 +04:00
parent 9f09ae660b
commit ac44fe1f12
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sql/filesort.cc
View file

@ -470,8 +470,7 @@ static void make_sortkey(register SORTPARAM *param,
switch (sort_field->result_type) { switch (sort_field->result_type) {
case STRING_RESULT: case STRING_RESULT:
{ {
// BAR TODO: need checking that it is really Field_str based class CHARSET_INFO *cs=item->str_value.charset();
CHARSET_INFO *cs=((Field_str*)(sort_field->field))->charset();
if (item->maybe_null) if (item->maybe_null)
*to++=1; *to++=1;
@ -947,9 +946,8 @@ sortlength(SORT_FIELD *sortorder, uint s_length)
sortorder->length=sortorder->item->max_length; sortorder->length=sortorder->item->max_length;
#ifdef USE_STRCOLL #ifdef USE_STRCOLL
if (!sortorder->item->binary) if (!sortorder->item->binary)
{ {
// BAR TODO: need checking that it is really Field_str based class CHARSET_INFO *cs=sortorder->item->str_value.charset();
CHARSET_INFO *cs=((Field_str*)(sortorder->field))->charset();
if (use_strcoll(cs)) if (use_strcoll(cs))
sortorder->length= sortorder->length*cs->strxfrm_multiply; sortorder->length= sortorder->length*cs->strxfrm_multiply;
} }