← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Add in new show work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1304
1304
  if (default_collation_name)
1305
1305
  {
1306
1306
    const CHARSET_INFO * const default_collation= get_charset_by_name(default_collation_name);
1307
 
    if (!default_collation)
 
1307
    if (not default_collation)
1308
1308
    {
1309
 
          errmsg_printf(ERRMSG_LVL_ERROR, _(ER(ER_UNKNOWN_COLLATION)), default_collation_name);
 
1309
      errmsg_printf(ERRMSG_LVL_ERROR, _(ER(ER_UNKNOWN_COLLATION)), default_collation_name);
1310
1310
      return 1;
1311
1311
    }
1312
 
    if (!my_charset_same(default_charset_info, default_collation))
 
1312
    if (not my_charset_same(default_charset_info, default_collation))
1313
1313
    {
1314
 
          errmsg_printf(ERRMSG_LVL_ERROR, _(ER(ER_COLLATION_CHARSET_MISMATCH)),
1315
 
                      default_collation_name,
1316
 
                      default_charset_info->csname);
 
1314
      errmsg_printf(ERRMSG_LVL_ERROR, _(ER(ER_COLLATION_CHARSET_MISMATCH)),
 
1315
                    default_collation_name,
 
1316
                    default_charset_info->csname);
1317
1317
      return 1;
1318
1318
    }
1319
1319
    default_charset_info= default_collation;
1323
1323
 
1324
1324
  global_system_variables.optimizer_switch= 0;
1325
1325
 
1326
 
  if (!(character_set_filesystem=
 
1326
  if (not (character_set_filesystem=
1327
1327
        get_charset_by_csname(character_set_filesystem_name, MY_CS_PRIMARY)))
1328
1328
    return 1;
1329
1329
  global_system_variables.character_set_filesystem= character_set_filesystem;