← Back to branch summary

~stewart/drizzle/nofrm

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Stewart Smith
  • Date: 2009-02-22 06:28:04 UTC
  • mfrom: (869.1.29 drizzle)
  • Revision ID: stewart@flamingspork.com-20090222062804-ssplgcffmroxwjph
merge mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
1388
1388
      switch (sortorder->result_type) {
1389
1389
      case STRING_RESULT:
1390
1390
        sortorder->length=sortorder->item->max_length;
1391
 
        set_if_smaller(sortorder->length, session->variables.max_sort_length);
 
1391
        set_if_smaller(sortorder->length,
 
1392
                       (size_t) session->variables.max_sort_length);
1392
1393
        if (use_strnxfrm((cs=sortorder->item->collation.collation)))
1393
1394
        {
1394
1395
          sortorder->length= cs->coll->strnxfrmlen(cs, sortorder->length);
1423
1424
      if (sortorder->item->maybe_null)
1424
1425
        length++;                               // Place for NULL marker
1425
1426
    }
1426
 
    set_if_smaller(sortorder->length, session->variables.max_sort_length);
 
1427
    set_if_smaller(sortorder->length,
 
1428
                   (size_t)session->variables.max_sort_length);
1427
1429
    length+=sortorder->length;
1428
1430
  }
1429
1431
  sortorder->field= (Field*) 0;                 // end marker