← 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: 2011-11-04 21:06:16 UTC
  • mto: This revision was merged to the branch mainline in revision 2450.
  • Revision ID: brian@tangent.org-20111104210616-2at42agch94dkwb0
Additional fixes for libdrizzle.

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";
220
221
static const char* lc_time_names_name= "en_US";
221
222
static const char* default_storage_engine_str= "innodb";
222
223
static const char* const compiled_default_collation_name= "utf8_general_ci";
475
476
{
476
477
  std::stringstream temp;
477
478
  temp << _("Aborting:") << "\"" << message << "\"" << ". Abort was called from " << file << ":" << line << " in " << func << "()";
478
 
  errmsg_printf(error::ERROR, "%s", temp.str().c_str());
 
479
  errmsg_printf(error::ERROR, temp.str().c_str());
479
480
 
480
481
  clean_up(vm.count("help") == 0);
481
482
  internal::my_end();
1419
1420
  /* Set collactions that depends on the default collation */
1420
1421
  global_system_variables.collation_server=      default_charset_info;
1421
1422
 
1422
 
  if (not (character_set_filesystem= get_charset_by_csname("binary", MY_CS_PRIMARY)))
 
1423
  if (not (character_set_filesystem=
 
1424
           get_charset_by_csname(character_set_filesystem_name, MY_CS_PRIMARY)))
1423
1425
  {
1424
1426
    errmsg_printf(error::ERROR, _("Error setting collation"));
1425
1427
    return false;
1441
1443
 
1442
1444
bool was_help_requested()
1443
1445
{
1444
 
  return vm.count("help");
 
1446
  if (vm.count("help") == 0)
 
1447
  {
 
1448
    return false;
 
1449
  }
 
1450
 
 
1451
  return true;
1445
1452
}
1446
1453
 
1447
1454
void usage();