← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/enum.h

  • Committer: lbieber
  • Date: 2010-09-23 15:49:15 UTC
  • mfrom: (1788.1.3 build)
  • Revision ID: lbieber@orisndriz08-20100923154915-mshh9pwln0igdwrn
Merge Brian - Rollup patch of enum + style on varchar. This modifies enum to always being the same value.
Merge Stewart - Fix embedded_innodb plugin now that TIMESTAMP is 8 bytes. 
Merge Shrews - fix bug 643630 -  Transaction_reader not handling CHAR values that include quotes properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/enum.h
28
28
 
29
29
class Field_enum :public Field_str
30
30
{
31
 
protected:
32
 
  uint32_t packlength;
33
31
public:
34
32
 
35
33
  using Field::store;
46
44
             unsigned char *null_ptr_arg,
47
45
             unsigned char null_bit_arg,
48
46
             const char *field_name_arg,
49
 
             uint32_t packlength_arg,
50
47
             TYPELIB *typelib_arg,
51
48
             const CHARSET_INFO * const charset_arg)
52
49
    :Field_str(ptr_arg,
55
52
               null_bit_arg,
56
53
                     field_name_arg,
57
54
               charset_arg),
58
 
    packlength(packlength_arg),
59
55
    typelib(typelib_arg)
60
56
  {
61
57
    flags|= ENUM_FLAG;
62
58
  }
63
59
  Field *new_field(memory::Root *root, Table *new_table, bool keep_type);
64
 
  enum ha_base_keytype key_type() const;
 
60
  enum ha_base_keytype key_type() const { return HA_KEYTYPE_ULONG_INT; }
65
61
  int  store(const char *to, uint32_t length, const CHARSET_INFO * const);
66
62
  int  store(double nr);
67
63
  int  store(int64_t nr, bool unsigned_val);
85
81
  {
86
82
    return INT_RESULT;
87
83
  }
88
 
  uint32_t pack_length() const
89
 
  {
90
 
    return (uint32_t) packlength;
91
 
  }
 
84
  uint32_t pack_length() const { return 4; }
92
85
  uint32_t size_of() const
93
86
  {
94
87
    return sizeof(*this);