Drizzle

Merge lp:~tobi-coldtobi/drizzle/trunk-bug-983258 into lp:drizzle

  1. trunk-bug-983258
  2. Merge into 7.2
Proposed by coldtobi
Status: Merged
Approved by: Brian Aker
Approved revision: 2581
Merged at revision: 2588
Proposed branch: lp:~tobi-coldtobi/drizzle/trunk-bug-983258
Merge into: lp:drizzle
Diff against target: 27 lines (+6/-4)
1 file modified
drizzled/drizzled.cc (+6/-4)
To merge this branch: bzr merge lp:~tobi-coldtobi/drizzle/trunk-bug-983258
Reviewer Review Type Date Requested Status
Brian Aker Needs Information
Clint Byrum (community) Approve
Review via email: mp+120291@code.launchpad.net

Description of the change

See LP bug 983258

To post a comment you must log in.
Revision history for this message
Clint Byrum (clint-fewbar) wrote :

LGTM

review: Approve
Revision history for this message
Brian Aker (brianaker) wrote :

I'm not sure I understand this bit:

10 + bool usage();
11 + usage();

review: Needs Information
Revision history for this message
coldtobi (tobi-coldtobi) wrote :

> I'm not sure I understand this bit:
>
> 10 + bool usage();
> 11 + usage();

Line 10 is just a forward declaration for thema call in june 11.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc 2012-06-03 17:33:43 +0000
+++ drizzled/drizzled.cc 2012-08-19 12:56:23 +0000
@@ -1411,6 +1411,12 @@
14111411
1412 full_options.add(plugin_options);1412 full_options.add(plugin_options);
14131413
1414 if ( was_help_requested())
1415 {
1416 bool usage();
1417 usage();
1418 }
1419
1414 vector<string> final_unknown_options;1420 vector<string> final_unknown_options;
1415 try1421 try
1416 {1422 {
@@ -2191,10 +2197,6 @@
21912197
2192static void fix_paths()2198static void fix_paths()
2193{2199{
2194 if (vm.count("help"))
2195 {
2196 return;
2197 }
21982200
2199 {2201 {
2200 if (pid_file.string().size() and pid_file.string()[0] == '/')2202 if (pid_file.string().size() and pid_file.string()[0] == '/')

Subscribers

People subscribed via source and target branches

to all changes: