← Back to branch summary

~linuxjedi/drizzle/drizzle-bug-651948

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: lbieber
  • Date: 2010-09-20 18:35:09 UTC
  • mfrom: (1779.1.4 build)
  • Revision ID: lbieber@orisndriz08-20100920183509-zjw31nf3f8clzu8k
Merge Joe - fix bug 641685 statement_transform.cc was not handling NULL values when dealing with NULL values.
Merge Shrews - fix bug 641687 - Quote ENUM values when building SQL from GPB Transaction messages.
Merge Monty - fix bug 549882 - Throw an error in configure from a bad --prefix value
Merge Monty - fix bug 565050 - Don't fail if root user runs drizzled --help

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1288
1288
  global_system_variables.optimizer_prune_level=
1289
1289
    vm.count("disable-optimizer-prune") ? false : true;
1290
1290
 
1291
 
  if ((user_info= check_user(drizzled_user)))
 
1291
  if (vm.count("help") == 0 && vm.count("help-extended") == 0)
1292
1292
  {
1293
 
    set_user(drizzled_user, user_info);
 
1293
    if ((user_info= check_user(drizzled_user)))
 
1294
    {
 
1295
      set_user(drizzled_user, user_info);
 
1296
    }
1294
1297
  }
1295
1298
 
1296
1299
  fix_paths(argv[0]);