← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2009-02-09 19:20:19 UTC
  • Revision ID: brian@tangent.org-20090209192019-ihmx9nwacvq9ivrn
Remove charset directory code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1848
1848
    if (next_character_set_name)
1849
1849
      *next_character_set_name++= '\0';
1850
1850
    if (!(default_charset_info=
1851
 
          get_charset_by_csname(default_character_set_name,
1852
 
                                MY_CS_PRIMARY, MYF(MY_WME))))
 
1851
          get_charset_by_csname(default_character_set_name, MY_CS_PRIMARY)))
1853
1852
    {
1854
1853
      if (next_character_set_name)
1855
1854
      {
1865
1864
 
1866
1865
  if (default_collation_name)
1867
1866
  {
1868
 
    const CHARSET_INFO * const default_collation=
1869
 
      get_charset_by_name(default_collation_name, MYF(0));
 
1867
    const CHARSET_INFO * const default_collation= get_charset_by_name(default_collation_name);
1870
1868
    if (!default_collation)
1871
1869
    {
1872
1870
          errmsg_printf(ERRMSG_LVL_ERROR, _(ER(ER_UNKNOWN_COLLATION)), default_collation_name);
1889
1887
  global_system_variables.optimizer_switch= 0;
1890
1888
 
1891
1889
  if (!(character_set_filesystem=
1892
 
        get_charset_by_csname(character_set_filesystem_name,
1893
 
                              MY_CS_PRIMARY, MYF(MY_WME))))
 
1890
        get_charset_by_csname(character_set_filesystem_name, MY_CS_PRIMARY)))
1894
1891
    return 1;
1895
1892
  global_system_variables.character_set_filesystem= character_set_filesystem;
1896
1893
 
3224
3221
 
3225
3222
static void usage(void)
3226
3223
{
3227
 
  if (!(default_charset_info= get_charset_by_csname(default_character_set_name,
3228
 
                                                   MY_CS_PRIMARY,
3229
 
                                                   MYF(MY_WME))))
 
3224
  if (!(default_charset_info= get_charset_by_csname(default_character_set_name, MY_CS_PRIMARY)))
3230
3225
    exit(1);
3231
3226
  if (!default_collation_name)
3232
3227
    default_collation_name= (char*) default_charset_info->name;