← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drizzled/drizzled.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:
drizzled/drizzled.cc
330
330
drizzle_system_variables max_system_variables;
331
331
global_counters current_global_counters;
332
332
 
333
 
DRIZZLED_API const CHARSET_INFO *system_charset_info;
334
 
const CHARSET_INFO *files_charset_info;
335
 
const CHARSET_INFO *table_alias_charset;
336
 
const CHARSET_INFO *character_set_filesystem;
 
333
DRIZZLED_API const charset_info_st *system_charset_info;
 
334
const charset_info_st *files_charset_info;
 
335
const charset_info_st *table_alias_charset;
 
336
const charset_info_st *character_set_filesystem;
337
337
 
338
338
MY_LOCALE *my_default_lc_time_names;
339
339
 
1493
1493
 
1494
1494
  if (default_collation_name)
1495
1495
  {
1496
 
    const CHARSET_INFO * const default_collation= get_charset_by_name(default_collation_name);
 
1496
    const charset_info_st * const default_collation= get_charset_by_name(default_collation_name);
1497
1497
    if (not default_collation)
1498
1498
    {
1499
1499
      errmsg_printf(error::ERROR, _(ER(ER_UNKNOWN_COLLATION)), default_collation_name);