← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ref.cc

  • Committer: Olaf van der Spek
  • Date: 2011-03-05 14:20:59 UTC
  • mfrom: (2220 staging)
  • mto: (2227.1.5 build)
  • mto: This revision was merged to the branch mainline in revision 2228.
  • Revision ID: olafvdspek@gmail.com-20110305142059-flk5j4dqop1u0xcz
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/ref.cc
267
267
        Item_field* fld;
268
268
        if (!(fld= new Item_field(from_field)))
269
269
          goto error;
270
 
        session->change_item_tree(reference, fld);
 
270
        *reference= fld;
271
271
        mark_as_dependent(session, last_checked_context->select_lex,
272
272
                          session->getLex()->current_select, this, fld);
273
273
        /*
369
369
}
370
370
 
371
371
 
372
 
void Item_ref::print(String *str, enum_query_type query_type)
 
372
void Item_ref::print(String *str)
373
373
{
374
374
  if (ref)
375
375
  {
379
379
      str->append_identifier(name, (uint32_t) strlen(name));
380
380
    }
381
381
    else
382
 
      (*ref)->print(str, query_type);
 
382
      (*ref)->print(str);
383
383
  }
384
384
  else
385
 
    Item_ident::print(str, query_type);
 
385
    Item_ident::print(str);
386
386
}
387
387
 
388
388