← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Mark Atwood
  • Date: 2011-06-27 19:01:37 UTC
  • mfrom: (2318.6.90 refactor16)
  • Revision ID: me@mark.atwood.name-20110627190137-iflt3vku0kw77l8a
merge lp:~olafvdspek/drizzle/refactor17

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
786
786
    Item *real_itm= real_item();
787
787
 
788
788
    ref_pointer_array[el]= real_itm;
789
 
    if (!(item_ref= new Item_aggregate_ref(&session->lex().current_select->context,
790
 
                                           ref_pointer_array + el, 0, name)))
791
 
      return; /* fatal_error is set */
 
789
    item_ref= new Item_aggregate_ref(&session->lex().current_select->context, ref_pointer_array + el, 0, name);
792
790
    if (type() == SUM_FUNC_ITEM)
793
791
      item_ref->depended_from= ((Item_sum *) this)->depended_from();
794
792
    fields.push_front(real_itm);