← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugin/collation_dictionary/collations.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:
plugin/collation_dictionary/collations.cc
52
52
 
53
53
bool CollationsTool::Generator::check()
54
54
{
55
 
  const CHARSET_INFO *tmp_cs= character_set();
56
 
  const CHARSET_INFO *tmp_cl= collation();
 
55
  const charset_info_st *tmp_cs= character_set();
 
56
  const charset_info_st *tmp_cl= collation();
57
57
 
58
58
  if (not tmp_cl || 
59
59
      not (tmp_cl->state & MY_CS_AVAILABLE) ||
117
117
 
118
118
void CollationsTool::Generator::fill()
119
119
{
120
 
  const CHARSET_INFO *tmp_cs= character_set();
121
 
  const CHARSET_INFO *tmp_cl= collation_iter[0];
 
120
  const charset_info_st *tmp_cs= character_set();
 
121
  const charset_info_st *tmp_cl= collation_iter[0];
122
122
 
123
123
  assert(tmp_cs);
124
124
  assert(tmp_cl);