← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/sum.h

Merged Nathan from lp:~nlws/drizzle/list-conversions

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/sum.h
29
29
#include <drizzled/item/field.h>
30
30
#include <drizzled/item/bin_string.h>
31
31
#include <mystrings/m_string.h>
 
32
#include <vector>
32
33
 
33
34
extern "C"
34
35
int group_concat_key_cmp_with_distinct(void* arg, const void* key1,
262
263
    directly or indirectly used under this function it as it's unclear
263
264
    at the moment of fixing outer field whether it's aggregated or not.
264
265
  */
265
 
  List<Item_field> outer_fields;
 
266
  std::vector<Item_field*> outer_fields;
266
267
 
267
268
protected:
268
269
  table_map used_tables_cache;