← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2011-03-24 18:19:30 UTC
  • mfrom: (2239.5.2 drizzle-ga)
  • Revision ID: brian@tangent.org-20110324181930-2zhzn672jlluyrdc
Merge in Elliot to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1461
1461
  global_system_variables.optimizer_prune_level=
1462
1462
    vm.count("disable-optimizer-prune") ? false : true;
1463
1463
 
1464
 
  if (vm.count("help") == 0 && vm.count("help-extended") == 0)
 
1464
  if (! vm["help"].as<bool>())
1465
1465
  {
1466
1466
    if ((user_info= check_user(drizzled_user)))
1467
1467
    {