← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/console/console.cc

  • Committer: Olaf van der Spek
  • Date: 2011-03-28 23:48:44 UTC
  • mto: (2257.1.1 build) (2276.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: olafvdspek@gmail.com-20110328234844-ufirvtasojvjsxoc
Common fwd

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/console/console.cc
367
367
static int init(drizzled::module::Context &context)
368
368
{
369
369
  const module::option_map &vm= context.getOptions();
370
 
  context.add(new ListenConsole("console", vm["username"].as<string>(), 
371
 
    vm["password"].as<string>(), vm["schema"].as<string>(), vm["catalog"].as<string>()));
 
370
  const string username(vm.count("username") ? vm["username"].as<string>() : "");
 
371
  const string password(vm.count("password") ? vm["password"].as<string>() : "");
 
372
  const string schema(vm.count("schema") ? vm["schema"].as<string>() : "");
 
373
 
 
374
  const std::string catalog(vm.count("catalog") ? vm["catalog"].as<string>() : "LOCAL");
 
375
 
 
376
  context.add(new ListenConsole("console", username, password, schema, catalog));
 
377
 
372
378
  return 0;
373
379
}
374
380
 
381
387
          po::value<bool>(&debug_enabled)->default_value(false)->zero_tokens(),
382
388
          N_("Turn on extra debugging."));
383
389
  context("username",
384
 
          po::value<string>()->default_value(""),
 
390
          po::value<string>(),
385
391
          N_("User to use for auth."));
386
392
  context("password",
387
 
          po::value<string>()->default_value(""),
 
393
          po::value<string>(),
388
394
          N_("Password to use for auth."));
389
395
  context("catalog",
390
 
          po::value<string>()->default_value("LOCAL"),
 
396
          po::value<string>(),
391
397
          N_("Default catalog to use."));
392
398
  context("schema",
393
 
          po::value<string>()->default_value(""),
 
399
          po::value<string>(),
394
400
          N_("Default schema to use."));
395
401
}
396
402