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

[Clint Byrum]

Same fix as for trunk, against elliot series.

=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2011-03-08 10:16:48 +0000
+++ drizzled/drizzled.cc	2011-03-22 23:36:16 +0000
@@ -1475,7 +1475,7 @@
   global_system_variables.optimizer_prune_level=
     vm.count("disable-optimizer-prune") ? false : true;
 
-  if (vm.count("help") == 0 && vm.count("help-extended") == 0)
+  if (! vm["help"].as<bool>())
   {
     if ((user_info= check_user(drizzled_user)))
     {