← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/func.cc

  • Committer: Brian Aker
  • Date: 2011-02-12 10:06:03 UTC
  • mfrom: (2154.2.16 drizzle-build)
  • Revision ID: brian@tangent.org-20110212100603-i5ww0s02p8l4a8q7
Merge in solaris tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/func.cc
84
84
      args= tmp_arg;
85
85
    else
86
86
    {
87
 
      if (!(args=(Item**) session->alloc(sizeof(Item*)*arg_count)))
 
87
      if (!(args=(Item**) session->getMemRoot()->allocate(sizeof(Item*)*arg_count)))
88
88
        return;
89
89
    }
90
90
    memcpy(args, item->args, sizeof(Item*)*arg_count);