← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/make_set.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/function/str/make_set.cc
116
116
  Item *new_item= item->transform(transformer, arg);
117
117
  if (!new_item)
118
118
    return 0;
119
 
 
120
 
  /*
121
 
    Session::change_item_tree() should be called only if the tree was
122
 
    really transformed, i.e. when a new item has been created.
123
 
    Otherwise we'll be allocating a lot of unnecessary memory for
124
 
    change records at each execution.
125
 
  */
126
 
  if (item != new_item)
127
 
    session.change_item_tree(&item, new_item);
128
 
 
 
119
  item= new_item;
129
120
  return Item_str_func::transform(transformer, arg);
130
121
}
131
122