← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/item_sum.cc

  • Committer: Brian Aker
  • Date: 2008-07-22 18:31:32 UTC
  • Revision ID: brian@tangent.org-20080722183132-ne2ntl7g7mdf2eez
uint32 -> uin32_t

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/item_sum.cc
2447
2447
  Item_sum_count_distinct* item = (Item_sum_count_distinct*)arg;
2448
2448
  Field **field    = item->table->field;
2449
2449
  Field **field_end= field + item->table->s->fields;
2450
 
  uint32 *lengths=item->field_lengths;
 
2450
  uint32_t *lengths=item->field_lengths;
2451
2451
  for (; field < field_end; ++field)
2452
2452
  {
2453
2453
    Field* f = *field;
2609
2609
      }
2610
2610
      else
2611
2611
      {
2612
 
        uint32 *length;
 
2612
        uint32_t *length;
2613
2613
        compare_key= (qsort_cmp2) composite_key_cmp;
2614
2614
        cmp_arg= (void*) this;
2615
 
        field_lengths= (uint32*) thd->alloc(table->s->fields * sizeof(uint32));
 
2615
        field_lengths= (uint32_t*) thd->alloc(table->s->fields * sizeof(uint32_t));
2616
2616
        for (tree_key_length= 0, length= field_lengths, field= table->field;
2617
2617
             field < field_end; ++field, ++length)
2618
2618
        {
3288
3288
  null_value= 1;
3289
3289
  max_length= thd->variables.group_concat_max_len;
3290
3290
 
3291
 
  uint32 offset;
 
3291
  uint32_t offset;
3292
3292
  if (separator->needs_conversion(separator->length(), separator->charset(),
3293
3293
                                  collation.collation, &offset))
3294
3294
  {
3295
 
    uint32 buflen= collation.collation->mbmaxlen * separator->length();
 
3295
    uint32_t buflen= collation.collation->mbmaxlen * separator->length();
3296
3296
    uint errors, conv_length;
3297
3297
    char *buf;
3298
3298
    String *new_separator;