← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-92

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Continuous Integration
  • Date: 2012-09-05 04:24:23 UTC
  • mfrom: (2580.5.1 drizzle-bug-983258)
  • Revision ID: ci@drizzle.org-20120905042423-1dyrq9z1i0dqs1yt
Merge lp:~tobi-coldtobi/drizzle/trunk-bug-983258

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1421
1421
 
1422
1422
  full_options.add(plugin_options);
1423
1423
 
 
1424
  if ( was_help_requested())
 
1425
  {
 
1426
          bool usage();
 
1427
          usage();
 
1428
  }
 
1429
 
1424
1430
  vector<string> final_unknown_options;
1425
1431
  try
1426
1432
  {
2201
2207
 
2202
2208
static void fix_paths()
2203
2209
{
2204
 
  if (vm.count("help"))
2205
 
  {
2206
 
    return;
2207
 
  }
2208
2210
 
2209
2211
  {
2210
2212
    if (pid_file.string().size() and pid_file.string()[0] == '/')