← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Andrew Hutchings
  • Date: 2010-11-19 11:12:29 UTC
  • mto: (1942.1.2 b)
  • mto: This revision was merged to the branch mainline in revision 1943.
  • Revision ID: andrew@linuxjedi.co.uk-20101119111229-v46y61giq6surimo
Revert -v fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
304
304
static bool preserve_comments= false;
305
305
static uint32_t opt_max_input_line;
306
306
static uint32_t opt_drizzle_port= 0;
307
 
static uint8_t  opt_silent, verbose= 0;
 
307
static int  opt_silent, verbose= 0;
308
308
static drizzle_capabilities_t connect_flag= DRIZZLE_CAPABILITIES_NONE;
309
309
static char *histfile;
310
310
static char *histfile_tmp;
321
321
  current_host,
322
322
  current_prompt,
323
323
  current_user,
 
324
  opt_verbose,
324
325
  current_password,
325
326
  opt_password,
326
327
  opt_protocol;
1309
1310
  N_("Only allow UPDATE and DELETE that uses keys."))
1310
1311
  ("i-am-a-dummy,U", po::value<bool>(&safe_updates)->default_value(false)->zero_tokens(),
1311
1312
  N_("Synonym for option --safe-updates, -U."))
1312
 
  ("verbose,v", po::value<uint8_t>(&verbose)->default_value(0),
1313
 
  N_("Verbosity of output (0-3, anything above 3 imples 3)"))
 
1313
  ("verbose,v", po::value<string>(&opt_verbose)->default_value(""),
 
1314
  N_("-v vvv implies that verbose= 3, Used to specify verbose"))
1314
1315
  ("version,V", N_("Output version information and exit."))
1315
1316
  ("secure-auth", po::value<bool>(&opt_secure_auth)->default_value(false)->zero_tokens(),
1316
1317
  N_("Refuse client connecting to server if it uses old (pre-4.1.1) protocol"))
1636
1637
      tty_password= true;
1637
1638
  }
1638
1639
  
 
1640
 
 
1641
  if (!opt_verbose.empty())
 
1642
  {
 
1643
    verbose= opt_verbose.length();
 
1644
  }
 
1645
 
1639
1646
  if (vm.count("batch"))
1640
1647
  {
1641
1648
    status.setBatch(1);