← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/collation_dictionary/collations.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:
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);