← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleslap.cc

  • Committer: lbieber
  • Date: 2010-09-26 21:17:42 UTC
  • mfrom: (1793.3.3 drizzle-bug-646202)
  • mto: This revision was merged to the branch mainline in revision 1796.
  • Revision ID: lbieber@orisndriz08-20100926211742-yy2fu65qjcotmonp
Merge Andrew - fix bug 646202 - Turn off Boost PO option guessing

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleslap.cc
913
913
       "Delay the startup of threads by a random number of microsends (the maximum of the delay")
914
914
      ("delimiter,F",po::value<string>(&delimiter)->default_value("\n"),
915
915
       "Delimiter to use in SQL statements supplied in file or command line")
916
 
      ("engine ,e",po::value<string>(&default_engine)->default_value(""),
917
 
       "Storage engien to use for creating the table")
 
916
      ("engine,e",po::value<string>(&default_engine)->default_value(""),
 
917
       "Storage engine to use for creating the table")
918
918
      ("set-random-seed",
919
919
       po::value<uint32_t>(&opt_set_random_seed)->default_value(0), 
920
920
       "Seed for random number generator (srandom(3)) ") 
951
951
    drizzle_con_st con;
952
952
    OptionString *eptr;
953
953
 
 
954
    // Disable allow_guessing
 
955
    int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
954
956
 
955
957
    po::variables_map vm;
956
958
    po::store(po::command_line_parser(argc, argv).options(long_options).
957
 
            extra_parser(parse_password_arg).run(), vm);
 
959
              style(style).extra_parser(parse_password_arg).run(), vm);
958
960
 
959
961
    std::string user_config_dir_slap(user_config_dir);
960
962
    user_config_dir_slap.append("/drizzle/drizzleslap.cnf");