← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/row.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/row.cc
180
180
    Item *new_item= items[i]->transform(transformer, arg);
181
181
    if (!new_item)
182
182
      return 0;
183
 
 
184
 
    /*
185
 
      Session::change_item_tree() should be called only if the tree was
186
 
      really transformed, i.e. when a new item has been created.
187
 
      Otherwise we'll be allocating a lot of unnecessary memory for
188
 
      change records at each execution.
189
 
    */
190
 
    if (items[i] != new_item)
191
 
      getSession().change_item_tree(&items[i], new_item);
 
183
      items[i]= new_item;
192
184
  }
193
185
  return (this->*transformer)(arg);
194
186
}