← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/func.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 11:45:17 UTC
  • mfrom: (2318.6.64 rf)
  • Revision ID: me@mark.atwood.name-20110624114517-1mq8no6jlp2nrg7m
merge lp:~olafvdspek/drizzle/refactor15

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/func.cc
122
122
  if (arg_count <= 2 || (args=(Item**) memory::sql_alloc(sizeof(Item*)*arg_count)))
123
123
  {
124
124
    List<Item>::iterator li(list.begin());
125
 
    Item *item;
126
125
    Item **save_args= args;
127
126
 
128
 
    while ((item=li++))
 
127
    while (Item* item=li++)
129
128
    {
130
129
      *(save_args++)= item;
131
130
      with_sum_func|=item->with_sum_func;