← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ref.cc

  • Committer: Lee Bieber
  • Date: 2011-02-28 23:00:55 UTC
  • mfrom: (2208.1.4 build)
  • Revision ID: kalebral@gmail.com-20110228230055-g9cq8faquzm5cvpi
Merge Olaf - Remove Session::change_item_tree
Merge Shrew/Joe - 720908: slave will not reconnect if initial connection to master is unsuccessful
Merge Shrews - 723923: Make sleep intervals for slave plugin configurable
Merge Patrck - 726784: dbqp not properly resetting itself after a test failure 

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
        /*