← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/sum.cc

  • Committer: Brian Aker
  • Date: 2009-02-26 05:21:02 UTC
  • mfrom: (896.1.5 fix-osxs)
  • Revision ID: brian@intel-mini-2.local-20090226052102-8xtbjt8kph6mi0qx
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/sum.cc
1041
1041
    simple_raw_key_cmp because the table contains numbers only; decimals
1042
1042
    are converted to binary representation as well.
1043
1043
  */
1044
 
  tree= new Unique(simple_raw_key_cmp, &tree_key_length, tree_key_length,
1045
 
                   session->variables.max_heap_table_size);
 
1044
  tree= new Unique(simple_raw_key_cmp, &tree_key_length,
 
1045
                   tree_key_length,
 
1046
                   (size_t)session->variables.max_heap_table_size);
1046
1047
 
1047
1048
  is_evaluated= false;
1048
1049
  return(tree == 0);
2679
2680
    }
2680
2681
    assert(tree == 0);
2681
2682
    tree= new Unique(compare_key, cmp_arg, tree_key_length,
2682
 
                     session->variables.max_heap_table_size);
 
2683
                     (size_t)session->variables.max_heap_table_size);
2683
2684
    /*
2684
2685
      The only time tree_key_length could be 0 is if someone does
2685
2686
      count(distinct) on a char(0) field - stupid thing to do,
3189
3190
  result.set_charset(collation.collation);
3190
3191
  result_field= 0;
3191
3192
  null_value= 1;
3192
 
  max_length= session->variables.group_concat_max_len;
 
3193
  max_length= (size_t)session->variables.group_concat_max_len;
3193
3194
 
3194
3195
  uint32_t offset;
3195
3196
  if (separator->needs_conversion(separator->length(), separator->charset(),
3321
3322
    unique_filter= new Unique(group_concat_key_cmp_with_distinct,
3322
3323
                              (void*)this,
3323
3324
                              tree_key_length,
3324
 
                              session->variables.max_heap_table_size);
 
3325
                              (size_t)session->variables.max_heap_table_size);
3325
3326
 
3326
3327
  return(false);
3327
3328
}