← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merged up with brian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1149
1149
  {"show_create_db",       (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_SHOW_CREATE_DB]), SHOW_LONG_STATUS},
1150
1150
  {"show_create_table",    (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_SHOW_CREATE]), SHOW_LONG_STATUS},
1151
1151
  {"show_databases",       (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_SHOW_DATABASES]), SHOW_LONG_STATUS},
1152
 
  {"show_engine_status",   (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_SHOW_ENGINE_STATUS]), SHOW_LONG_STATUS},
1153
1152
  {"show_errors",          (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_SHOW_ERRORS]), SHOW_LONG_STATUS},
1154
1153
  {"show_fields",          (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_SHOW_FIELDS]), SHOW_LONG_STATUS},
1155
1154
  {"show_keys",            (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_SHOW_KEYS]), SHOW_LONG_STATUS},
1156
 
  {"show_open_tables",     (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_SHOW_OPEN_TABLES]), SHOW_LONG_STATUS},
1157
1155
  {"show_processlist",     (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_SHOW_PROCESSLIST]), SHOW_LONG_STATUS},
1158
1156
  {"show_status",          (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_SHOW_STATUS]), SHOW_LONG_STATUS},
1159
1157
  {"show_table_status",    (char*) offsetof(STATUS_VAR, com_stat[(uint32_t) SQLCOM_SHOW_TABLE_STATUS]), SHOW_LONG_STATUS},
1306
1304
  if (default_collation_name)
1307
1305
  {
1308
1306
    const CHARSET_INFO * const default_collation= get_charset_by_name(default_collation_name);
1309
 
    if (!default_collation)
 
1307
    if (not default_collation)
1310
1308
    {
1311
 
          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);
1312
1310
      return 1;
1313
1311
    }
1314
 
    if (!my_charset_same(default_charset_info, default_collation))
 
1312
    if (not my_charset_same(default_charset_info, default_collation))
1315
1313
    {
1316
 
          errmsg_printf(ERRMSG_LVL_ERROR, _(ER(ER_COLLATION_CHARSET_MISMATCH)),
1317
 
                      default_collation_name,
1318
 
                      default_charset_info->csname);
 
1314
      errmsg_printf(ERRMSG_LVL_ERROR, _(ER(ER_COLLATION_CHARSET_MISMATCH)),
 
1315
                    default_collation_name,
 
1316
                    default_charset_info->csname);
1319
1317
      return 1;
1320
1318
    }
1321
1319
    default_charset_info= default_collation;
1325
1323
 
1326
1324
  global_system_variables.optimizer_switch= 0;
1327
1325
 
1328
 
  if (!(character_set_filesystem=
 
1326
  if (not (character_set_filesystem=
1329
1327
        get_charset_by_csname(character_set_filesystem_name, MY_CS_PRIMARY)))
1330
1328
    return 1;
1331
1329
  global_system_variables.character_set_filesystem= character_set_filesystem;