← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 20:45:43 UTC
  • mfrom: (2257 drizzle)
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329204543-ssex0nuo8knncgwx
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
825
825
      switch (sort_field->result_type) {
826
826
      case STRING_RESULT:
827
827
        {
828
 
          const CHARSET_INFO * const cs=item->collation.collation;
 
828
          const charset_info_st * const cs=item->collation.collation;
829
829
          char fill_char= ((cs->state & MY_CS_BINSORT) ? (char) 0 : ' ');
830
830
          int diff;
831
831
          uint32_t sort_field_length;
1477
1477
uint32_t FileSort::sortlength(SortField *sortorder, uint32_t s_length, bool *multi_byte_charset)
1478
1478
{
1479
1479
  uint32_t length;
1480
 
  const CHARSET_INFO *cs;
 
1480
  const charset_info_st *cs;
1481
1481
  *multi_byte_charset= 0;
1482
1482
 
1483
1483
  length=0;