← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Committer: Brian Aker
Date: 2011-03-24 06:52:54 UTC
mfrom: (2239.6.1 elliot-fix-user)
mto: (2239.5.3 elliott-build)
mto: This revision was merged to the branch mainline in revision 2250.
Revision ID: brian@tangent.org-20110324065254-vo7a48p2c7ulr065

Merge in fix for --user.

files modified:
drizzled/drizzled.cc

Show diffs side-by-side

added added

removed removed

drizzled/drizzled.cc

1475

1475

global_system_variables.optimizer_prune_level=

1476

1476

vm.count("disable-optimizer-prune") ? false : true;

1477

1477

1478

if (vm.count("help") == 0 && vm.count("help-extended") == 0)

1478

if (! vm["help"].as<bool>())

1479

1479

{

1480

1480

if ((user_info= check_user(drizzled_user)))

1481

1481

{

Older »