Drizzle

Merge lp:~clint-fewbar/drizzle/fix-user-option into lp:~drizzle-trunk/drizzle/development

  1. fix-user-option
  2. Merge into development
Proposed by Clint Byrum
Status: Merged
Approved by: Brian Aker
Approved revision: 2246
Merged at revision: 2253
Proposed branch: lp:~clint-fewbar/drizzle/fix-user-option
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 12 lines (+1/-1)
1 file modified
drizzled/drizzled.cc (+1/-1)
To merge this branch: bzr merge lp:~clint-fewbar/drizzle/fix-user-option
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+54445@code.launchpad.net

Description of the change

Use the appropriate method to determine if --help has been called so that the code which sets the user id is actually called.

Also removes the help-extended check, which is an option that I cannot find implemented or documented anywhere inside the code base.

To post a comment you must log in.

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 2011-03-08 10:16:48 +0000
3+++ drizzled/drizzled.cc 2011-03-22 23:35:40 +0000
4@@ -1475,7 +1475,7 @@
5 global_system_variables.optimizer_prune_level=
6 vm.count("disable-optimizer-prune") ? false : true;
7
8- if (vm.count("help") == 0 && vm.count("help-extended") == 0)
9+ if (! vm["help"].as<bool>())
10 {
11 if ((user_info= check_user(drizzled_user)))
12 {