← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/func.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/func.cc
356
356
      Item *new_item= (*arg)->transform(transformer, argument);
357
357
      if (!new_item)
358
358
        return 0;
359
 
 
360
 
      /*
361
 
        Session::change_item_tree() should be called only if the tree was
362
 
        really transformed, i.e. when a new item has been created.
363
 
        Otherwise we'll be allocating a lot of unnecessary memory for
364
 
        change records at each execution.
365
 
      */
366
 
      if (*arg != new_item)
367
 
        getSession().change_item_tree(arg, new_item);
 
359
      *arg= new_item;
368
360
    }
369
361
  }
370
362
  return (this->*transformer)(argument);
412
404
      unsigned char *arg_v= *arg_p;
413
405
      Item *new_item= (*arg)->compile(analyzer, &arg_v, transformer, arg_t);
414
406
      if (new_item && *arg != new_item)
415
 
        current_session->change_item_tree(arg, new_item);
 
407
        *arg= new_item;
416
408
    }
417
409
  }
418
410
  return (this->*transformer)(arg_t);