← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-03-09 19:18:36 UTC
  • mfrom: (923 drizzle)
  • mto: (934.3.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 938.
  • Revision ID: osullivan.padraig@gmail.com-20090309191836-ixiam3xa55off3do
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
19
19
 
20
20
 
21
21
#include <drizzled/server_includes.h>
22
 
#include CMATH_H
23
 
 
24
22
#include <drizzled/sql_select.h>
25
23
#include <drizzled/error.h>
26
24
#include <drizzled/show.h>
51
49
#include <drizzled/field/datetime.h>
52
50
#include <drizzled/field/varstring.h>
53
51
 
54
 
 
55
 
#if defined(CMATH_NAMESPACE)
56
 
using namespace CMATH_NAMESPACE;
57
 
#endif
 
52
#include <math.h>
58
53
 
59
54
const String my_null_string("NULL", 4, default_charset_info);
60
55