← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ref.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/ref.cc
265
265
      if (from_field != not_found_field)
266
266
      {
267
267
        Item_field* fld;
268
 
        if (!(fld= new Item_field(from_field)))
269
 
          goto error;
 
268
        fld= new Item_field(from_field);
270
269
        *reference= fld;
271
270
        mark_as_dependent(session, last_checked_context->select_lex,
272
271
                          session->lex().current_select, this, fld);