← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/sum.cc

Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/sum.cc
20
20
  @brief
21
21
  Sum functions (COUNT, MIN...)
22
22
*/
23
 
#include "config.h"
 
23
#include <config.h>
24
24
#include <cstdio>
25
25
#include <math.h>
26
26
#include <drizzled/sql_select.h>
41
41
 
42
42
#include <drizzled/type/decimal.h>
43
43
 
44
 
#include "drizzled/internal/m_string.h"
 
44
#include <drizzled/internal/m_string.h>
45
45
 
46
46
#include <algorithm>
47
47