← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/console/console.cc

  • Committer: Mark Atwood
  • Date: 2011-06-10 07:17:06 UTC
  • mfrom: (2281.7.9 trunk-bug-743902)
  • Revision ID: me@mark.atwood.name-20110610071706-u1ezbs37euuyqrx9
merge lp:~linuxjedi/drizzle/trunk-bug-743902

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/console/console.cc
27
27
 
28
28
#include <boost/program_options.hpp>
29
29
 
 
30
#include <client/user_detect.h>
 
31
 
30
32
using namespace std;
31
33
using namespace drizzled;
32
34
 
374
376
  context("debug",
375
377
          po::value<bool>(&debug_enabled)->default_value(false)->zero_tokens(),
376
378
          N_("Turn on extra debugging."));
 
379
  UserDetect detected_user;
 
380
  const char* shell_user= detected_user.getUser();
377
381
  context("username",
378
 
          po::value<string>()->default_value(""),
 
382
          po::value<string>()->default_value(shell_user ? shell_user : ""),
379
383
          N_("User to use for auth."));
380
384
  context("password",
381
385
          po::value<string>()->default_value(""),