← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/opt_range.cc

  • Committer: Stewart Smith
  • Date: 2009-03-18 00:29:24 UTC
  • mto: (942.1.10 mordred)
  • mto: This revision was merged to the branch mainline in revision 945.
  • Revision ID: stewart@flamingspork.com-20090318002924-gixoh4t5mhbw8qyz
make set_if_bigger typesafe for C and C++. Fix up everywhere.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/opt_range.cc
6594
6594
                               flag)))
6595
6595
    return 1;                   // out of memory
6596
6596
 
6597
 
  set_if_bigger(quick->max_used_key_length, range->min_length);
6598
 
  set_if_bigger(quick->max_used_key_length, range->max_length);
 
6597
  set_if_bigger(quick->max_used_key_length, (uint32_t)range->min_length);
 
6598
  set_if_bigger(quick->max_used_key_length, (uint32_t)range->max_length);
6599
6599
  set_if_bigger(quick->used_key_parts, (uint32_t) key_tree->part+1);
6600
6600
  if (insert_dynamic(&quick->ranges, (unsigned char*) &range))
6601
6601
    return 1;
8736
8736
    quick_prefix_selectivity= (double) quick_prefix_records /
8737
8737
                              (double) table_records;
8738
8738
    num_groups= (uint32_t) rint(num_groups * quick_prefix_selectivity);
8739
 
    set_if_bigger(num_groups, 1);
 
8739
    set_if_bigger(num_groups, 1U);
8740
8740
  }
8741
8741
 
8742
8742
  if (used_key_parts > group_key_parts)