← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Olaf van der Spek
  • Date: 2011-11-22 14:53:10 UTC
  • mto: This revision was merged to the branch mainline in revision 2464.
  • Revision ID: olafvdspek@gmail.com-20111122145310-ebg2sdiz77kuyy4i
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
217
217
static uint32_t wake_thread;
218
218
static const char* drizzled_chroot;
219
219
static const char* default_character_set_name= "utf8";
220
 
static const char* character_set_filesystem_name= "binary";
221
220
static const char* lc_time_names_name= "en_US";
222
221
static const char* default_storage_engine_str= "innodb";
223
222
static const char* const compiled_default_collation_name= "utf8_general_ci";
1420
1419
  /* Set collactions that depends on the default collation */
1421
1420
  global_system_variables.collation_server=      default_charset_info;
1422
1421
 
1423
 
  if (not (character_set_filesystem=
1424
 
           get_charset_by_csname(character_set_filesystem_name, MY_CS_PRIMARY)))
 
1422
  if (not (character_set_filesystem= get_charset_by_csname("binary", MY_CS_PRIMARY)))
1425
1423
  {
1426
1424
    errmsg_printf(error::ERROR, _("Error setting collation"));
1427
1425
    return false;
1443
1441
 
1444
1442
bool was_help_requested()
1445
1443
{
1446
 
  if (vm.count("help") == 0)
1447
 
  {
1448
 
    return false;
1449
 
  }
1450
 
 
1451
 
  return true;
 
1444
  return vm.count("help");
1452
1445
}
1453
1446
 
1454
1447
void usage();