← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/enum.h

Merge Stewart

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/enum.h
36
36
 
37
37
  /** Internal storage for the string values of the ENUM */
38
38
  TYPELIB *typelib;
39
 
  Field_enum(unsigned char *ptr_arg, uint32_t len_arg, unsigned char *null_ptr_arg,
 
39
  Field_enum(unsigned char *ptr_arg,
 
40
             uint32_t len_arg,
 
41
             unsigned char *null_ptr_arg,
40
42
             unsigned char null_bit_arg,
41
 
             enum utype unireg_check_arg, const char *field_name_arg,
 
43
             const char *field_name_arg,
42
44
             uint32_t packlength_arg,
43
45
             TYPELIB *typelib_arg,
44
46
             const CHARSET_INFO * const charset_arg)
45
 
    :Field_str(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
46
 
               unireg_check_arg, field_name_arg, charset_arg),
47
 
    packlength(packlength_arg),typelib(typelib_arg)
 
47
    :Field_str(ptr_arg,
 
48
               len_arg,
 
49
               null_ptr_arg,
 
50
               null_bit_arg,
 
51
                     field_name_arg,
 
52
               charset_arg),
 
53
    packlength(packlength_arg),
 
54
    typelib(typelib_arg)
48
55
  {
49
 
      flags|=ENUM_FLAG;
 
56
    flags|= ENUM_FLAG;
50
57
  }
51
58
  Field *new_field(MEM_ROOT *root, Table *new_table, bool keep_type);
52
59
  enum ha_base_keytype key_type() const;