← Back to branch summary

~stewart/drizzle/use-catalog-for-path

« back to all changes in this revision

Viewing changes to drizzled/field/uuid.cc

  • Committer: Brian Aker
  • Date: 2011-03-28 02:46:21 UTC
  • Revision ID: brian@tangent.org-20110328024621-wtkdtlvdplqm0ybf
Shift CHARSET_INFO to charset_info_st

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/uuid.cc
56
56
  return memcmp(a, b, sizeof(uuid_t));
57
57
}
58
58
 
59
 
int Uuid::store(const char *from, uint32_t length, const CHARSET_INFO * const )
 
59
int Uuid::store(const char *from, uint32_t length, const charset_info_st * const )
60
60
{
61
61
  ASSERT_COLUMN_MARKED_FOR_WRITE;
62
62
  type::Uuid uu;
135
135
 
136
136
String *Uuid::val_str(String *val_buffer, String *) const
137
137
{
138
 
  const CHARSET_INFO * const cs= &my_charset_bin;
 
138
  const charset_info_st * const cs= &my_charset_bin;
139
139
  uint32_t mlength= (type::Uuid::DISPLAY_BUFFER_LENGTH) * cs->mbmaxlen;
140
140
  type::Uuid uu;
141
141