1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for crash in the case of non-string fields

Browse Source
This commit is contained in:
unknown 2002-03-20 17:33:10 +04:00
parent 474e64081b
commit bbde41e9f7
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sql/filesort.cc
View File

@ -925,10 +925,13 @@ sortlength(SORT_FIELD *sortorder, uint s_length)
{ {
sortorder->length=sortorder->field->pack_length(); sortorder->length=sortorder->field->pack_length();
#ifdef USE_STRCOLL #ifdef USE_STRCOLL
// BAR TODO: need checking that it is really Field_str based class if (!sortorder->field->binary())
CHARSET_INFO *cs=((Field_str*)(sortorder->field))->charset(); {
if (use_strcoll(cs) && !sortorder->field->binary()) // BAR TODO: need checking that it is really Field_str based class
sortorder->length= sortorder->length*cs->strxfrm_multiply; CHARSET_INFO *cs=((Field_str*)(sortorder->field))->charset();
if (use_strcoll(cs))
sortorder->length= sortorder->length*cs->strxfrm_multiply;
}
#endif #endif
} }
if (sortorder->field->maybe_null()) if (sortorder->field->maybe_null())
@ -937,15 +940,19 @@ sortlength(SORT_FIELD *sortorder, uint s_length)
else else
{ {
#ifdef USE_STRCOLL #ifdef USE_STRCOLL
// BAR TODO: need checking that it is really Field_str based class
CHARSET_INFO *cs=((Field_str*)(sortorder->field))->charset();
#endif #endif
switch ((sortorder->result_type=sortorder->item->result_type())) { switch ((sortorder->result_type=sortorder->item->result_type())) {
case STRING_RESULT: case STRING_RESULT:
sortorder->length=sortorder->item->max_length; sortorder->length=sortorder->item->max_length;
#ifdef USE_STRCOLL #ifdef USE_STRCOLL
if (use_strcoll(cs) && !sortorder->item->binary) if (!sortorder->item->binary)
sortorder->length= sortorder->length*cs->strxfrm_multiply; {
// BAR TODO: need checking that it is really Field_str based class
CHARSET_INFO *cs=((Field_str*)(sortorder->field))->charset();
if (use_strcoll(cs))
sortorder->length= sortorder->length*cs->strxfrm_multiply;
}
#endif #endif
break; break;
case INT_RESULT: case INT_RESULT: