Drizzle

Merge lp:~vjsamuel/drizzle/fix-bug-651256 into lp:~drizzle-trunk/drizzle/development

  1. fix-bug-651256
  2. Merge into development
Proposed by Vijay Samuel
Status: Merged
Approved by: Monty Taylor
Approved revision: 1803
Merged at revision: 1804
Proposed branch: lp:~vjsamuel/drizzle/fix-bug-651256
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 58 lines (+3/-10)
1 file modified
drizzled/drizzled.cc (+3/-10)
To merge this branch: bzr merge lp:~vjsamuel/drizzle/fix-bug-651256
Reviewer Review Type Date Requested Status
Monty Taylor Approve
Review via email: mp+37031@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Monty Taylor (mordred) wrote :

good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/drizzled.cc'
2--- drizzled/drizzled.cc 2010-09-28 16:06:47 +0000
3+++ drizzled/drizzled.cc 2010-09-29 17:33:58 +0000
4@@ -194,7 +194,6 @@
5 Used with --help for detailed option
6 */
7 bool opt_help= false;
8-bool opt_help_extended= false;
9
10 arg_cmp_func Arg_comparator::comparator_matrix[5][2] =
11 {{&Arg_comparator::compare_string, &Arg_comparator::compare_e_string},
12@@ -500,7 +499,7 @@
13
14 if (exit_code)
15 errmsg_printf(ERRMSG_LVL_ERROR, _("Aborting\n"));
16- else if (opt_help || opt_help_extended)
17+ else if (opt_help)
18 usage();
19 clean_up(!opt_help && (exit_code));
20 internal::my_end();
21@@ -1226,8 +1225,6 @@
22 std::string system_config_file_drizzle("drizzled.cnf");
23
24 config_options.add_options()
25- ("help-extended", po::value<bool>(&opt_help_extended)->default_value(false)->zero_tokens(),
26- N_("Display this help and exit after initializing plugins."))
27 ("help,?", po::value<bool>(&opt_help)->default_value(false)->zero_tokens(),
28 N_("Display this help and exit."))
29 ("no-defaults", po::value<bool>()->default_value(false)->zero_tokens(),
30@@ -1614,7 +1611,7 @@
31 ha_init_errors();
32
33
34- if (opt_help || opt_help_extended)
35+ if (opt_help)
36 unireg_abort(0);
37
38 if (plugin_finalize(plugins))
39@@ -1755,10 +1752,6 @@
40 {"help", '?', N_("Display this help and exit."),
41 (char**) &opt_help, (char**) &opt_help, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
42 0, 0},
43- {"help-extended", '?',
44- N_("Display this help and exit after initializing plugins."),
45- (char**) &opt_help_extended, (char**) &opt_help_extended,
46- 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
47 {"auto-increment-increment", OPT_AUTO_INCREMENT,
48 N_("Auto-increment columns are incremented by this"),
49 (char**) &global_system_variables.auto_increment_increment,
50@@ -2412,7 +2405,7 @@
51 internal::convert_dirname(buff,buff,NULL);
52 (void) internal::my_load_path(language,language,buff);
53
54- if (not opt_help and not opt_help_extended)
55+ if (not opt_help)
56 {
57 const char *tmp_string= getenv("TMPDIR") ? getenv("TMPDIR") : NULL;
58 struct stat buf;