← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/functions/time/makedate.h

  • Committer: Monty
  • Date: 2008-11-23 09:42:22 UTC
  • mto: This revision was merged to the branch mainline in revision 603.
  • Revision ID: mordred@palanthas.inaugust.com-20081123094222-dkb2ze91dpn1dq87
Fix merge-related build errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/functions/time/makedate.h
20
20
#ifndef DRIZZLED_FUNCTIONS_TIME_MAKEDATE_H
21
21
#define DRIZZLED_FUNCTIONS_TIME_MAKEDATE_H
22
22
 
 
23
#include <drizzled/functions/time/date.h>
 
24
 
23
25
class Item_func_makedate :public Item_date_func
24
26
{
25
27
public:
26
28
  Item_func_makedate(Item *a,Item *b) :Item_date_func(a,b) {}
27
29
  String *val_str(String *str);
28
30
  const char *func_name() const { return "makedate"; }
29
 
  enum_field_types field_type() const { return DRIZZLE_TYPE_NEWDATE; }
 
31
  enum_field_types field_type() const { return DRIZZLE_TYPE_DATE; }
30
32
  void fix_length_and_dec()
31
33
  {
32
34
    decimals=0;