← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/func.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/func.cc
33
33
#include <limits>
34
34
#include <algorithm>
35
35
 
 
36
using namespace drizzled;
36
37
using namespace std;
37
38
 
38
39
void Item_func::set_arguments(List<Item> &list)
40
41
  allowed_arg_cols= 1;
41
42
  arg_count=list.elements;
42
43
  args= tmp_arg;                                // If 2 arguments
43
 
  if (arg_count <= 2 || (args=(Item**) sql_alloc(sizeof(Item*)*arg_count)))
 
44
  if (arg_count <= 2 || (args=(Item**) memory::sql_alloc(sizeof(Item*)*arg_count)))
44
45
  {
45
46
    List_iterator_fast<Item> li(list);
46
47
    Item *item;