← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/charset.cc

  • Committer: Brian Aker
  • Date: 2009-05-14 16:47:01 UTC
  • mfrom: (1014.3.4 merge)
  • Revision ID: brian@gaz-20090514164701-l58qmp3mqo6et160
Merging Brian's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/charset.cc
260
260
  const CHARSET_INFO *cs;
261
261
  (void) init_available_charsets(MYF(0));       /* If it isn't initialized */
262
262
 
263
 
  cs_number=get_collation_number(cs_name);
 
263
  cs_number= get_collation_number(cs_name);
264
264
  cs= cs_number ? get_internal_charset(cs_number) : NULL;
265
265
 
266
266
  return cs;