← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.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.cc
792
792
    if (type() == SUM_FUNC_ITEM)
793
793
      item_ref->depended_from= ((Item_sum *) this)->depended_from();
794
794
    fields.push_front(real_itm);
795
 
    session->change_item_tree(ref, item_ref);
 
795
    *ref= item_ref;
796
796
  }
797
797
}
798
798
 
1569
1569
  }
1570
1570
 
1571
1571
  if (new_item)
1572
 
    session->change_item_tree(ref, new_item);
 
1572
    *ref= new_item;
1573
1573
}
1574
1574
 
1575
1575
bool field_is_equal_to_item(Field *field,Item *item)