← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/enum.h

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 20:45:43 UTC
  • mfrom: (2257 drizzle)
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329204543-ssex0nuo8knncgwx
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/enum.h
44
44
             unsigned char null_bit_arg,
45
45
             const char *field_name_arg,
46
46
             TYPELIB *typelib_arg,
47
 
             const CHARSET_INFO * const charset_arg)
 
47
             const charset_info_st * const charset_arg)
48
48
    :Field_str(ptr_arg,
49
49
               len_arg,
50
50
               null_ptr_arg,
57
57
  }
58
58
  Field *new_field(memory::Root *root, Table *new_table, bool keep_type);
59
59
  enum ha_base_keytype key_type() const { return HA_KEYTYPE_ULONG_INT; }
60
 
  int  store(const char *to, uint32_t length, const CHARSET_INFO * const);
 
60
  int  store(const char *to, uint32_t length, const charset_info_st * const);
61
61
  int  store(double nr);
62
62
  int  store(int64_t nr, bool unsigned_val);
63
63
  double val_real(void) const;
102
102
    return true;
103
103
  }
104
104
  /* enum and set are sorted as integers */
105
 
  const CHARSET_INFO *sort_charset(void) const { return &my_charset_bin; }
 
105
  const charset_info_st *sort_charset(void) const { return &my_charset_bin; }
106
106
};
107
107
 
108
108
} /* namespace drizzled */