← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/dtcollation.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/dtcollation.cc
38
38
}
39
39
 
40
40
 
41
 
DTCollation::DTCollation(const CHARSET_INFO * const collation_arg,
 
41
DTCollation::DTCollation(const charset_info_st * const collation_arg,
42
42
                         Derivation derivation_arg)
43
43
{
44
44
  collation= collation_arg;
53
53
}
54
54
 
55
55
 
56
 
void DTCollation::set(const CHARSET_INFO * const collation_arg,
 
56
void DTCollation::set(const charset_info_st * const collation_arg,
57
57
                      Derivation derivation_arg)
58
58
{
59
59
  collation= collation_arg;
61
61
}
62
62
 
63
63
 
64
 
void DTCollation::set(const CHARSET_INFO * const collation_arg)
 
64
void DTCollation::set(const charset_info_st * const collation_arg)
65
65
{
66
66
  collation= collation_arg;
67
67
}
166
166
        set(dt);
167
167
        return false;
168
168
      }
169
 
      const CHARSET_INFO * const bin= get_charset_by_csname(collation->csname, MY_CS_BINSORT);
 
169
      const charset_info_st * const bin= get_charset_by_csname(collation->csname, MY_CS_BINSORT);
170
170
      set(bin, DERIVATION_NONE);
171
171
    }
172
172
  }