← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/ctype.cc

  • 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/ctype.cc
54
54
  char   comment[MY_CS_CSDESCR_SIZE];
55
55
  char   tailoring[MY_CS_TAILORING_SIZE];
56
56
  size_t tailoring_length;
57
 
  CHARSET_INFO cs;
58
 
  int (*add_collation)(CHARSET_INFO *cs);
 
57
  charset_info_st cs;
 
58
  int (*add_collation)(charset_info_st *cs);
59
59
} MY_CHARSET_LOADER;
60
60
 
61
61
} /* namespace drizzled */