Merge lp:~clint-fewbar/drizzle/elliot-fix-user-option into lp:drizzle/7.0

Proposed by Clint Byrum on 2011-03-22
Status: Merged
Approved by: Brian Aker on 2011-03-23
Approved revision: 2240
Merged at revision: 2241
Proposed branch: lp:~clint-fewbar/drizzle/elliot-fix-user-option
Merge into: lp:drizzle/7.0
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/elliot-fix-user-option
Reviewer Review Type Date Requested Status
Drizzle Developers 2011-03-22 Pending
Review via email: mp+54446@code.launchpad.net

Description of the change

Same fix as for trunk, against elliot series.

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:36:16 +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 {

Subscribers

People subscribed via source and target branches