Merge lp:~linuxjedi/drizzle/drizzle-bug-646202 into lp:~drizzle-trunk/drizzle/development

[Andrew Hutchings]

Remove option guessing which caused problems due to bugs in boost such as wrong option choice when an options is named exactly right but there is a similarly named option

[Monty Taylor (mordred)]

Good work.

review: Approve

[lp:~linuxjedi/drizzle/drizzle-bug-646202]

1796. By Andrew Hutchings on 2010-09-26

Fix spelling mistake

[Andrew Hutchings (linuxjedi)]

Please note: just pushed a up a new commit on the branch which fixes a spelling mistake on the engine message in drizzleslap.cc too.

=== modified file 'client/drizzle.cc'
--- client/drizzle.cc	2010-09-14 21:23:09 +0000
+++ client/drizzle.cc	2010-09-26 18:01:11 +0000
@@ -1408,8 +1408,12 @@
   po::positional_options_description p;
   p.add("database", 1);
 
+  // Disable allow_guessing
+  int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
+
   po::store(po::command_line_parser(argc, argv).options(long_options).
-            positional(p).extra_parser(parse_password_arg).run(), vm);
+            style(style).positional(p).extra_parser(parse_password_arg).run(),
+            vm);
 
   if (! vm["no-defaults"].as<bool>())
   {
 
=== modified file 'client/drizzledump.cc'
--- client/drizzledump.cc	2010-09-24 14:56:23 +0000
+++ client/drizzledump.cc	2010-09-26 18:01:11 +0000
@@ -610,8 +610,12 @@
 
   po::variables_map vm;
 
-  po::store(po::command_line_parser(argc, argv).options(all_options).
-            positional(p).extra_parser(parse_password_arg).run(), vm);
+  // Disable allow_guessing
+  int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
+
+  po::store(po::command_line_parser(argc, argv).style(style).
+            options(all_options).positional(p).
+            extra_parser(parse_password_arg).run(), vm);
 
   if (! vm.count("no-defaults"))
   {
 
=== modified file 'client/drizzleimport.cc'
--- client/drizzleimport.cc	2010-09-03 17:08:15 +0000
+++ client/drizzleimport.cc	2010-09-26 18:01:11 +0000
@@ -424,8 +424,11 @@
 
   po::variables_map vm;
 
+  // Disable allow_guessing
+  int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
+
   po::store(po::command_line_parser(argc, argv).options(long_options).
-            extra_parser(parse_password_arg).run(), vm);
+            style(style).extra_parser(parse_password_arg).run(), vm);
 
   std::string user_config_dir_import(user_config_dir);
   user_config_dir_import.append("/drizzle/drizzleimport.cnf"); 
 
=== modified file 'client/drizzleslap.cc'
--- client/drizzleslap.cc	2010-09-13 22:18:58 +0000
+++ client/drizzleslap.cc	2010-09-26 18:01:11 +0000
@@ -913,8 +913,8 @@
        "Delay the startup of threads by a random number of microsends (the maximum of the delay")
       ("delimiter,F",po::value<string>(&delimiter)->default_value("\n"),
        "Delimiter to use in SQL statements supplied in file or command line")
-      ("engine ,e",po::value<string>(&default_engine)->default_value(""),
-       "Storage engien to use for creating the table")
+      ("engine,e",po::value<string>(&default_engine)->default_value(""),
+       "Storage engine to use for creating the table")
       ("set-random-seed",
        po::value<uint32_t>(&opt_set_random_seed)->default_value(0), 
        "Seed for random number generator (srandom(3)) ") 
@@ -951,10 +951,12 @@
     drizzle_con_st con;
     OptionString *eptr;
 
+    // Disable allow_guessing
+    int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
 
     po::variables_map vm;
     po::store(po::command_line_parser(argc, argv).options(long_options).
-            extra_parser(parse_password_arg).run(), vm);
+              style(style).extra_parser(parse_password_arg).run(), vm);
 
     std::string user_config_dir_slap(user_config_dir);
     user_config_dir_slap.append("/drizzle/drizzleslap.cnf"); 
 
=== modified file 'client/drizzletest.cc'
--- client/drizzletest.cc	2010-09-16 14:38:00 +0000
+++ client/drizzletest.cc	2010-09-26 18:01:11 +0000
@@ -5479,8 +5479,12 @@
 
   po::variables_map vm;
 
+  // Disable allow_guessing
+  int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
+
   po::store(po::command_line_parser(argc, argv).options(long_options).
-            positional(p).extra_parser(parse_password_arg).run(), vm);
+            style(style).positional(p).extra_parser(parse_password_arg).run(),
+            vm);
 
   if (! vm["no-defaults"].as<bool>())
   {
 
=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2010-09-26 01:21:36 +0000
+++ drizzled/drizzled.cc	2010-09-26 18:01:11 +0000
@@ -1342,7 +1342,10 @@
    N_("Base location for config files"))
   ;
 
-  po::parsed_options parsed= po::command_line_parser(argc, argv).
+  // Disable allow_guessing
+  int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
+
+  po::parsed_options parsed= po::command_line_parser(argc, argv).style(style).
     options(long_options).allow_unregistered().extra_parser(parse_size_arg).run();
   unknown_options=
     po::collect_unrecognized(parsed.options, po::include_positional);
@@ -1508,8 +1511,10 @@
   vector<string> final_unknown_options;
   try
   {
+    // Disable allow_guessing
+    int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
     po::parsed_options parsed=
-      po::command_line_parser(unknown_options).
+      po::command_line_parser(unknown_options).style(style).
       options(plugin_options).extra_parser(parse_size_arg).run();
 
     final_unknown_options=
 
=== modified file 'drizzled/message/table_writer.cc'
--- drizzled/message/table_writer.cc	2010-08-12 07:35:31 +0000
+++ drizzled/message/table_writer.cc	2010-09-26 18:01:11 +0000
@@ -232,7 +232,10 @@
   po::positional_options_description p;
   p.add("table-name", 1);
 
-  po::store(po::command_line_parser(argc, argv).options(desc).
+  // Disable allow_guessing
+  int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
+
+  po::store(po::command_line_parser(argc, argv).options(desc).style(style).
             positional(p).run(), vm);
 
   if (not vm.count("table-name"))
 
=== modified file 'unittests/option_context.cc'
--- unittests/option_context.cc	2010-06-16 22:09:59 +0000
+++ unittests/option_context.cc	2010-09-26 18:01:11 +0000
@@ -43,7 +43,10 @@
     "test", "--test.option=foo"
   };
 
-  po::store(po::command_line_parser(2, (char **)options).
+  // Disable allow_guessing
+  int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
+
+  po::store(po::command_line_parser(2, (char **)options).style(style).
             options(command_line_options).run(), vm);
   po::notify(vm);