Drizzle

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

  1. drizzle-bug-646202
  2. Merge into development
Proposed by Andrew Hutchings
Status: Merged
Approved by: Monty Taylor
Approved revision: 1795
Merged at revision: 1796
Proposed branch: lp:~linuxjedi/drizzle/drizzle-bug-646202
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 159 lines (+40/-12)
8 files modified
client/drizzle.cc (+5/-1)
client/drizzledump.cc (+6/-2)
client/drizzleimport.cc (+4/-1)
client/drizzleslap.cc (+5/-3)
client/drizzletest.cc (+5/-1)
drizzled/drizzled.cc (+7/-2)
drizzled/message/table_writer.cc (+4/-1)
unittests/option_context.cc (+4/-1)
To merge this branch: bzr merge lp:~linuxjedi/drizzle/drizzle-bug-646202
Reviewer Review Type Date Requested Status
Monty Taylor Approve
Review via email: mp+36653@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Monty Taylor (mordred) wrote :

Good work.

review: Approve
lp:~linuxjedi/drizzle/drizzle-bug-646202 updated
1796. By Andrew Hutchings

Fix spelling mistake

Revision history for this message
Andrew Hutchings (linuxjedi) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/drizzle.cc'
2--- client/drizzle.cc 2010-09-14 21:23:09 +0000
3+++ client/drizzle.cc 2010-09-26 18:01:11 +0000
4@@ -1408,8 +1408,12 @@
5 po::positional_options_description p;
6 p.add("database", 1);
7
8+ // Disable allow_guessing
9+ int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
10+
11 po::store(po::command_line_parser(argc, argv).options(long_options).
12- positional(p).extra_parser(parse_password_arg).run(), vm);
13+ style(style).positional(p).extra_parser(parse_password_arg).run(),
14+ vm);
15
16 if (! vm["no-defaults"].as<bool>())
17 {
18
19=== modified file 'client/drizzledump.cc'
20--- client/drizzledump.cc 2010-09-24 14:56:23 +0000
21+++ client/drizzledump.cc 2010-09-26 18:01:11 +0000
22@@ -610,8 +610,12 @@
23
24 po::variables_map vm;
25
26- po::store(po::command_line_parser(argc, argv).options(all_options).
27- positional(p).extra_parser(parse_password_arg).run(), vm);
28+ // Disable allow_guessing
29+ int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
30+
31+ po::store(po::command_line_parser(argc, argv).style(style).
32+ options(all_options).positional(p).
33+ extra_parser(parse_password_arg).run(), vm);
34
35 if (! vm.count("no-defaults"))
36 {
37
38=== modified file 'client/drizzleimport.cc'
39--- client/drizzleimport.cc 2010-09-03 17:08:15 +0000
40+++ client/drizzleimport.cc 2010-09-26 18:01:11 +0000
41@@ -424,8 +424,11 @@
42
43 po::variables_map vm;
44
45+ // Disable allow_guessing
46+ int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
47+
48 po::store(po::command_line_parser(argc, argv).options(long_options).
49- extra_parser(parse_password_arg).run(), vm);
50+ style(style).extra_parser(parse_password_arg).run(), vm);
51
52 std::string user_config_dir_import(user_config_dir);
53 user_config_dir_import.append("/drizzle/drizzleimport.cnf");
54
55=== modified file 'client/drizzleslap.cc'
56--- client/drizzleslap.cc 2010-09-13 22:18:58 +0000
57+++ client/drizzleslap.cc 2010-09-26 18:01:11 +0000
58@@ -913,8 +913,8 @@
59 "Delay the startup of threads by a random number of microsends (the maximum of the delay")
60 ("delimiter,F",po::value<string>(&delimiter)->default_value("\n"),
61 "Delimiter to use in SQL statements supplied in file or command line")
62- ("engine ,e",po::value<string>(&default_engine)->default_value(""),
63- "Storage engien to use for creating the table")
64+ ("engine,e",po::value<string>(&default_engine)->default_value(""),
65+ "Storage engine to use for creating the table")
66 ("set-random-seed",
67 po::value<uint32_t>(&opt_set_random_seed)->default_value(0),
68 "Seed for random number generator (srandom(3)) ")
69@@ -951,10 +951,12 @@
70 drizzle_con_st con;
71 OptionString *eptr;
72
73+ // Disable allow_guessing
74+ int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
75
76 po::variables_map vm;
77 po::store(po::command_line_parser(argc, argv).options(long_options).
78- extra_parser(parse_password_arg).run(), vm);
79+ style(style).extra_parser(parse_password_arg).run(), vm);
80
81 std::string user_config_dir_slap(user_config_dir);
82 user_config_dir_slap.append("/drizzle/drizzleslap.cnf");
83
84=== modified file 'client/drizzletest.cc'
85--- client/drizzletest.cc 2010-09-16 14:38:00 +0000
86+++ client/drizzletest.cc 2010-09-26 18:01:11 +0000
87@@ -5479,8 +5479,12 @@
88
89 po::variables_map vm;
90
91+ // Disable allow_guessing
92+ int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
93+
94 po::store(po::command_line_parser(argc, argv).options(long_options).
95- positional(p).extra_parser(parse_password_arg).run(), vm);
96+ style(style).positional(p).extra_parser(parse_password_arg).run(),
97+ vm);
98
99 if (! vm["no-defaults"].as<bool>())
100 {
101
102=== modified file 'drizzled/drizzled.cc'
103--- drizzled/drizzled.cc 2010-09-26 01:21:36 +0000
104+++ drizzled/drizzled.cc 2010-09-26 18:01:11 +0000
105@@ -1342,7 +1342,10 @@
106 N_("Base location for config files"))
107 ;
108
109- po::parsed_options parsed= po::command_line_parser(argc, argv).
110+ // Disable allow_guessing
111+ int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
112+
113+ po::parsed_options parsed= po::command_line_parser(argc, argv).style(style).
114 options(long_options).allow_unregistered().extra_parser(parse_size_arg).run();
115 unknown_options=
116 po::collect_unrecognized(parsed.options, po::include_positional);
117@@ -1508,8 +1511,10 @@
118 vector<string> final_unknown_options;
119 try
120 {
121+ // Disable allow_guessing
122+ int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
123 po::parsed_options parsed=
124- po::command_line_parser(unknown_options).
125+ po::command_line_parser(unknown_options).style(style).
126 options(plugin_options).extra_parser(parse_size_arg).run();
127
128 final_unknown_options=
129
130=== modified file 'drizzled/message/table_writer.cc'
131--- drizzled/message/table_writer.cc 2010-08-12 07:35:31 +0000
132+++ drizzled/message/table_writer.cc 2010-09-26 18:01:11 +0000
133@@ -232,7 +232,10 @@
134 po::positional_options_description p;
135 p.add("table-name", 1);
136
137- po::store(po::command_line_parser(argc, argv).options(desc).
138+ // Disable allow_guessing
139+ int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
140+
141+ po::store(po::command_line_parser(argc, argv).options(desc).style(style).
142 positional(p).run(), vm);
143
144 if (not vm.count("table-name"))
145
146=== modified file 'unittests/option_context.cc'
147--- unittests/option_context.cc 2010-06-16 22:09:59 +0000
148+++ unittests/option_context.cc 2010-09-26 18:01:11 +0000
149@@ -43,7 +43,10 @@
150 "test", "--test.option=foo"
151 };
152
153- po::store(po::command_line_parser(2, (char **)options).
154+ // Disable allow_guessing
155+ int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
156+
157+ po::store(po::command_line_parser(2, (char **)options).style(style).
158 options(command_line_options).run(), vm);
159 po::notify(vm);
160