← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Mark Atwood
  • Date: 2011-10-25 19:08:35 UTC
  • mfrom: (2445.1.6 rf)
  • Revision ID: me@mark.atwood.name-20111025190835-g21cn911ypxjd5fi
merge lp:~olafvdspek/drizzle/refactor7

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
858
858
              memcpy(tmp_buffer,from,length);
859
859
              from= tmp_buffer;
860
860
            }
861
 
            tmp_length= my_strnxfrm(cs,to,sort_field->length,
862
 
                                    (unsigned char*) from, length);
 
861
            tmp_length= cs->strnxfrm(to,sort_field->length, (unsigned char*) from, length);
863
862
            assert(tmp_length == sort_field->length);
864
863
          }
865
864
          else
866
865
          {
867
 
            my_strnxfrm(cs,(unsigned char*)to,length,(const unsigned char*)res->ptr(),length);
 
866
            cs->strnxfrm((unsigned char*)to,length,(const unsigned char*)res->ptr(),length);
868
867
            cs->cset->fill(cs, (char *)to+length,diff,fill_char);
869
868
          }
870
869
          break;
1450
1449
    {
1451
1450
      cs= sortorder->field->sort_charset();
1452
1451
      sortorder->length= sortorder->field->sort_length();
1453
 
 
1454
 
      if (use_strnxfrm((cs=sortorder->field->sort_charset())))
 
1452
      cs= sortorder->field->sort_charset();
 
1453
      if (cs->use_strnxfrm())
1455
1454
      {
1456
1455
        sortorder->need_strxnfrm= 1;
1457
1456
        *multi_byte_charset= 1;
1469
1468
      switch (sortorder->result_type) {
1470
1469
      case STRING_RESULT:
1471
1470
        sortorder->length=sortorder->item->max_length;
1472
 
        set_if_smaller(sortorder->length,
1473
 
                       getSession().variables.max_sort_length);
1474
 
        if (use_strnxfrm((cs=sortorder->item->collation.collation)))
 
1471
        set_if_smaller(sortorder->length, getSession().variables.max_sort_length);
 
1472
        cs= sortorder->item->collation.collation;
 
1473
        if (cs->use_strnxfrm())
1475
1474
        {
1476
1475
          sortorder->length= cs->coll->strnxfrmlen(cs, sortorder->length);
1477
1476
          sortorder->need_strxnfrm= 1;