← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Lee Bieber
  • Date: 2010-12-23 23:11:00 UTC
  • mfrom: (2024.1.1 clean)
  • Revision ID: kalebral@gmail.com-20101223231100-0rqirgz7ugkl10yp
Merge Brian - session list cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
564
564
  if (! indexfile && ! quick_select)
565
565
  {
566
566
    next_pos=(unsigned char*) 0;                        /* Find records in sequence */
567
 
    if (file->startTableScan(1))
568
 
      return(HA_POS_ERROR);
 
567
    file->startTableScan(1);
569
568
    file->extra_opt(HA_EXTRA_CACHE, getSession().variables.read_buff_size);
570
569
  }
571
570
 
575
574
    if (select->quick->reset())
576
575
      return(HA_POS_ERROR);
577
576
 
578
 
    if (read_record_info.init_read_record(&getSession(), select->quick->head, select, 1, 1))
579
 
      return(HA_POS_ERROR);
 
577
    read_record_info.init_read_record(&getSession(), select->quick->head, select, 1, 1);
580
578
  }
581
579
 
582
580
  /* Remember original bitmaps */
916
914
        }
917
915
      case DECIMAL_RESULT:
918
916
        {
919
 
          type::Decimal dec_buf, *dec_val= item->val_decimal_result(&dec_buf);
 
917
          my_decimal dec_buf, *dec_val= item->val_decimal_result(&dec_buf);
920
918
          if (maybe_null)
921
919
          {
922
920
            if (item->null_value)
927
925
            }
928
926
            *to++=1;
929
927
          }
930
 
          dec_val->val_binary(E_DEC_FATAL_ERROR, to,
931
 
                              item->max_length - (item->decimals ? 1:0),
932
 
                              item->decimals);
 
928
          my_decimal2binary(E_DEC_FATAL_ERROR, dec_val, to,
 
929
                            item->max_length - (item->decimals ? 1:0),
 
930
                            item->decimals);
933
931
          break;
934
932
        }
935
933
      case REAL_RESULT:
1526
1524
        break;
1527
1525
      case DECIMAL_RESULT:
1528
1526
        sortorder->length=
1529
 
          class_decimal_get_binary_size(sortorder->item->max_length -
 
1527
          my_decimal_get_binary_size(sortorder->item->max_length -
1530
1528
                                     (sortorder->item->decimals ? 1 : 0),
1531
1529
                                     sortorder->item->decimals);
1532
1530
        break;