# Author: Tobias Frost <tobi@coldtobi.de>
# Subject: Print help just after init plugins and not after parsing all
# options, making pid ...
--- a/drizzled/drizzled.cc
+++ b/drizzled/drizzled.cc
@@ -1411,6 +1411,12 @@
 
   full_options.add(plugin_options);
 
+  if ( was_help_requested())
+  {
+	  bool usage();
+	  usage();
+  }
+
   vector<string> final_unknown_options;
   try
   {
@@ -2191,10 +2197,6 @@
 
 static void fix_paths()
 {
-  if (vm.count("help"))
-  {
-    return;
-  }
 
   {
     if (pid_file.string().size() and pid_file.string()[0] == '/')