← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/opt_sum.cc

  • Committer: Brian Aker
  • Date: 2008-10-06 05:57:49 UTC
  • Revision ID: brian@tangent.org-20081006055749-svg700gciuqi0zu1
Remove all of uchar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/opt_sum.cc
227
227
        Item *expr=item_sum->args[0];
228
228
        if (expr->real_item()->type() == Item::FIELD_ITEM)
229
229
        {
230
 
          uchar key_buff[MAX_KEY_LENGTH];
 
230
          unsigned char key_buff[MAX_KEY_LENGTH];
231
231
          TABLE_REF ref;
232
232
          uint range_fl, prefix_len;
233
233
 
375
375
        Item *expr=item_sum->args[0];
376
376
        if (expr->real_item()->type() == Item::FIELD_ITEM)
377
377
        {
378
 
          uchar key_buff[MAX_KEY_LENGTH];
 
378
          unsigned char key_buff[MAX_KEY_LENGTH];
379
379
          TABLE_REF ref;
380
380
          uint range_fl, prefix_len;
381
381
 
667
667
    less_fl= 1-less_fl;                         // Convert '<' -> '>' (etc)
668
668
 
669
669
  /* Check if field is part of the tested partial key */
670
 
  uchar *key_ptr= ref->key_buff;
 
670
  unsigned char *key_ptr= ref->key_buff;
671
671
  KEY_PART_INFO *part;
672
672
  for (part= keyinfo->key_part; ; key_ptr+= part++->store_length)
673
673
 
716
716
    if (is_null)
717
717
    {
718
718
      part->field->set_null();
719
 
      *key_ptr= (uchar) 1;
 
719
      *key_ptr= (unsigned char) 1;
720
720
    }
721
721
    else
722
722
    {
723
723
      store_val_in_field(part->field, args[between && max_fl ? 2 : 1],
724
724
                         CHECK_FIELD_IGNORE);
725
725
      if (part->null_bit) 
726
 
        *key_ptr++= (uchar) test(part->field->is_null());
 
726
        *key_ptr++= (unsigned char) test(part->field->is_null());
727
727
      part->field->get_key_image(key_ptr, part->length, Field::itRAW);
728
728
    }
729
729
    if (is_field_part)