← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/create.cc

  • Committer: Monty Taylor
  • Date: 2010-02-05 08:11:15 UTC
  • mfrom: (1283 build)
  • mto: (1273.13.43 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: mordred@inaugust.com-20100205081115-dr82nvrwv4lvw7sd
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/create.cc
74
74
#include <drizzled/function/math/cos.h>
75
75
#include <drizzled/function/math/dec.h>
76
76
#include <drizzled/function/math/decimal_typecast.h>
77
 
#include <drizzled/function/math//exp.h>
 
77
#include <drizzled/function/math/exp.h>
78
78
#include <drizzled/function/field.h>
79
79
#include <drizzled/function/find_in_set.h>
80
80
#include <drizzled/function/math/floor.h>
106
106
#include <map>
107
107
 
108
108
using namespace std;
109
 
using namespace drizzled;
 
109
 
 
110
namespace drizzled
 
111
{
110
112
 
111
113
class Item;
112
114
 
2891
2893
  }
2892
2894
  return res;
2893
2895
}
 
2896
 
 
2897
} /* namespace drizzled */