← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/sum.cc

  • Committer: Lee Bieber
  • Date: 2011-02-23 17:17:54 UTC
  • mfrom: (2194.1.3 build)
  • Revision ID: kalebral@gmail.com-20110223171754-5g62btbvgtzsev3n
Merge Stewart - 676770: Error log logging 'Sort aborted' messages when DML fails with ER_INVALID_ENUM_VALUE     
Merge Olaf - Use Item_equal::begin() and Use List::size()
Merge Olaf - Delete drizzled/strfunc.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/sum.cc
227
227
    Check that non-aggregated fields and sum functions aren't mixed in the
228
228
    same select in the ONLY_FULL_GROUP_BY mode.
229
229
  */
230
 
  if (outer_fields.elements)
 
230
  if (outer_fields.size())
231
231
  {
232
232
    Item_field *field;
233
233
    /*
381
381
}
382
382
 
383
383
 
384
 
Item_sum::Item_sum(List<Item> &list) :arg_count(list.elements),
 
384
Item_sum::Item_sum(List<Item> &list) :arg_count(list.size()),
385
385
  forced_const(false)
386
386
{
387
387
  if ((args=(Item**) memory::sql_alloc(sizeof(Item*)*arg_count)))
2973
2973
   separator(separator_arg), tree(NULL), unique_filter(NULL), table(0),
2974
2974
   order(0), context(context_arg),
2975
2975
   arg_count_order(order_list ? order_list->elements : 0),
2976
 
   arg_count_field(select_list->elements),
 
2976
   arg_count_field(select_list->size()),
2977
2977
   count_cut_values(0),
2978
2978
   distinct(distinct_arg),
2979
2979
   warning_for_row(false),