← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/default_value.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/default_value.cc
130
130
  Item *new_item= arg->transform(transformer, args);
131
131
  if (!new_item)
132
132
    return NULL;
133
 
 
134
 
  /*
135
 
    Session::change_item_tree() should be called only if the tree was
136
 
    really transformed, i.e. when a new item has been created.
137
 
    Otherwise we'll be allocating a lot of unnecessary memory for
138
 
    change records at each execution.
139
 
  */
140
 
  if (arg != new_item)
141
 
    getSession().change_item_tree(&arg, new_item);
142
 
 
 
133
  arg= new_item;
143
134
  return (this->*transformer)(args);
144
135
}
145
136