← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/datetime.h

  • Committer: Diego Medina
  • Date: 2009-10-05 04:05:29 UTC
  • mfrom: (1161 staging)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: diego.medina@sun.com-20091005040529-5g1qe9gxzslpgefd
resolved small merge issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/datetime.h
31
31
  using Field::val_str;
32
32
  using Field::cmp;
33
33
 
34
 
  Field_datetime(unsigned char *ptr_arg, unsigned char *null_ptr_arg,
 
34
  Field_datetime(unsigned char *ptr_arg,
 
35
                 unsigned char *null_ptr_arg,
35
36
                 unsigned char null_bit_arg,
36
 
                 enum utype unireg_check_arg, const char *field_name_arg,
37
 
                 const CHARSET_INFO * const cs)
38
 
    :Field_str(ptr_arg, 19, null_ptr_arg, null_bit_arg,
39
 
               unireg_check_arg, field_name_arg, cs)
40
 
    {}
41
 
  Field_datetime(bool maybe_null_arg, const char *field_name_arg,
42
 
                 const CHARSET_INFO * const cs)
43
 
    :Field_str((unsigned char*) 0,19, maybe_null_arg ? (unsigned char*) "": 0,0,
44
 
               NONE, field_name_arg, cs) {}
 
37
                 const char *field_name_arg,
 
38
                 const CHARSET_INFO * const cs)
 
39
    :Field_str(ptr_arg,
 
40
               19,
 
41
               null_ptr_arg,
 
42
               null_bit_arg,
 
43
               field_name_arg,
 
44
               cs)
 
45
  {}
 
46
  Field_datetime(bool maybe_null_arg,
 
47
                 const char *field_name_arg,
 
48
                 const CHARSET_INFO * const cs)
 
49
    :Field_str((unsigned char*) 0,
 
50
               19,
 
51
               maybe_null_arg ? (unsigned char*) "": 0,
 
52
               0,
 
53
               field_name_arg,
 
54
               cs) 
 
55
  {}
45
56
  enum_field_types type() const { return DRIZZLE_TYPE_DATETIME;}
46
57
  enum ha_base_keytype key_type() const { return HA_KEYTYPE_ULONGLONG; }
47
58
  enum Item_result cmp_type () const { return INT_RESULT; }
69
80
};
70
81
 
71
82
#endif
72