← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to support-files/deb/debian/patches/fix-user-option.patch

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-06-19 10:46:49 UTC
  • mfrom: (1.1.6)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20120619104649-e2l0ggd4oz3um0f4
Tags: upstream-7.1.36-stable
Import upstream version 7.1.36-stable

Show diffs side-by-side

added added

removed removed

Lines of Context:
support-files/deb/debian/patches/fix-user-option.patch
 
1
Author: Clint Byrum <clint@fewbar.com>
 
2
Bug: https://launchpad.net/bugs/740583
 
3
Forwarded: https://code.launchpad.net/~clint-fewbar/drizzle/elliot-fix-user-option/+merge/54446
 
4
Description: Fixes inoperable --user option. 
 
5
Applied-Upstream: http://bazaar.launchpad.net/~drizzle-developers/drizzle/elliot/revision/2241
 
6
 
 
7
=== modified file 'drizzled/drizzled.cc'
 
8
Index: natty-no-run-as-root/drizzled/drizzled.cc
 
9
===================================================================
 
10
--- natty-no-run-as-root.orig/drizzled/drizzled.cc      2011-04-10 12:18:05.433791995 -0700
 
11
+++ natty-no-run-as-root/drizzled/drizzled.cc   2011-04-10 12:18:24.402552367 -0700
 
12
@@ -1475,7 +1475,7 @@
 
13
   global_system_variables.optimizer_prune_level=
 
14
     vm.count("disable-optimizer-prune") ? false : true;
 
15
 
 
16
-  if (vm.count("help") == 0 && vm.count("help-extended") == 0)
 
17
+  if (! vm["help"].as<bool>())
 
18
   {
 
19
     if ((user_info= check_user(drizzled_user)))
 
20
     {