← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/sum.cc

  • Committer: Lee Bieber
  • Date: 2011-03-22 17:41:09 UTC
  • mfrom: (2241.2.18 refactor2)
  • Revision ID: kalebral@gmail.com-20110322174109-1bsfvv4q1dnfd089
Merge Olaf - more code refactoring

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/sum.cc
1022
1022
    PS/SP. Hence all further allocations are performed in the runtime
1023
1023
    mem_root.
1024
1024
  */
1025
 
  if (field_list.push_back(&field_def))
1026
 
    return(true);
1027
 
 
 
1025
  field_list.push_back(&field_def);
1028
1026
  null_value= maybe_null= 1;
1029
1027
  quick_group= 0;
1030
1028
 
2599
2597
  for (uint32_t i=0; i < arg_count ; i++)
2600
2598
  {
2601
2599
    Item *item=args[i];
2602
 
    if (list.push_back(item))
2603
 
      return true;                              // End of memory
 
2600
    list.push_back(item);
2604
2601
    if (item->const_item() && item->is_null())
2605
2602
      always_null= 1;
2606
2603
  }
3226
3223
  for (uint32_t i= 0; i < arg_count_field; i++)
3227
3224
  {
3228
3225
    Item *item= args[i];
3229
 
    if (list.push_back(item))
3230
 
      return(true);
 
3226
    list.push_back(item);
3231
3227
    if (item->const_item())
3232
3228
    {
3233
3229
      if (item->is_null())