← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/field.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/field.cc
428
428
Item *Item_field::get_tmp_table_item(Session *session)
429
429
{
430
430
  Item_field *new_item= new Item_field(session, this);
431
 
  if (new_item)
432
 
    new_item->field= new_item->result_field;
 
431
  new_item->field= new_item->result_field;
433
432
  return new_item;
434
433
}
435
434
 
559
558
              fix_inner_refs() function.
560
559
            */
561
560
            ;
562
 
            if (!(rf= new Item_outer_ref(context, this)))
563
 
              return -1;
 
561
            rf= new Item_outer_ref(context, this);
564
562
            *reference= rf;
565
563
            select->inner_refs_list.push_back(rf);
566
564
            rf->in_sum_func= session->lex().in_sum_func;