← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Brian Aker
  • Date: 2010-12-20 10:21:10 UTC
  • mto: This revision was merged to the branch mainline in revision 2016.
  • Revision ID: brian@tangent.org-20101220102110-60oh6zarw5n9nhah
Fixing up a, somewhat, hidden unsigned type to solve a few issues around
numbers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
2043
2043
  {
2044
2044
    rollup.state= ROLLUP::STATE_READY;
2045
2045
    if (rollup_make_fields(field_list, send_fields, &func))
2046
 
      return(true);     // Should never happen
 
2046
      return true;     // Should never happen
2047
2047
  }
2048
2048
  else if (rollup.state == ROLLUP::STATE_NONE)
2049
2049
  {
2072
2072
  tmp_table_param.group_parts= send_group_parts;
2073
2073
 
2074
2074
  if (!(rollup.null_items= (Item_null_result**) session->alloc((sizeof(Item*) +
2075
 
                                                sizeof(Item**) +
2076
 
                                                sizeof(List<Item>) +
2077
 
                        ref_pointer_array_size)
2078
 
                        * send_group_parts )))
 
2075
                                                                sizeof(Item**) +
 
2076
                                                                sizeof(List<Item>) +
 
2077
                                                                ref_pointer_array_size)
 
2078
                                                               * send_group_parts )))
 
2079
  {
2079
2080
    return 1;
 
2081
  }
2080
2082
 
2081
2083
  rollup.fields= (List<Item>*) (rollup.null_items + send_group_parts);
2082
2084
  rollup.ref_pointer_arrays= (Item***) (rollup.fields + send_group_parts);