← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Mark Atwood
  • Date: 2011-12-11 22:56:39 UTC
  • mfrom: (2465.1.1 drizzle)
  • Revision ID: me@mark.atwood.name-20111211225639-3d8ype7g2y82dci5
merge lp:~brianaker/drizzle/libdrizzle-breakout

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";
476
475
{
477
476
  std::stringstream temp;
478
477
  temp << _("Aborting:") << "\"" << message << "\"" << ". Abort was called from " << file << ":" << line << " in " << func << "()";
479
 
  errmsg_printf(error::ERROR, temp.str().c_str());
 
478
  errmsg_printf(error::ERROR, "%s", temp.str().c_str());
480
479
 
481
480
  clean_up(vm.count("help") == 0);
482
481
  internal::my_end();
551
550
  if ((tmp_user_info= getpwnam(user)) == NULL)
552
551
  {
553
552
    // Allow a numeric uid to be used
554
 
    const char *pos;
555
 
    for (pos= user; my_isdigit(&my_charset_utf8_general_ci,*pos); pos++) ;
 
553
    const char *pos= user;
 
554
    for (; my_charset_utf8_general_ci.isdigit(*pos); pos++) 
 
555
    {
 
556
    }
556
557
    if (*pos)                                   // Not numeric id
557
558
      goto err;
558
559
 
1418
1419
  /* Set collactions that depends on the default collation */
1419
1420
  global_system_variables.collation_server=      default_charset_info;
1420
1421
 
1421
 
  if (not (character_set_filesystem=
1422
 
           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)))
1423
1423
  {
1424
1424
    errmsg_printf(error::ERROR, _("Error setting collation"));
1425
1425
    return false;
1441
1441
 
1442
1442
bool was_help_requested()
1443
1443
{
1444
 
  if (vm.count("help") == 0)
1445
 
  {
1446
 
    return false;
1447
 
  }
1448
 
 
1449
 
  return true;
 
1444
  return vm.count("help");
1450
1445
}
1451
1446
 
1452
1447
void usage();