← 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: 2010-07-30 06:00:36 UTC
  • mfrom: (1672.2.1 fix-plugin-loading)
  • Revision ID: brian@gaz-20100730060036-m5hatq9ch0eqtyf7
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
861
861
  /* Allow storage engine to give real error messages */
862
862
  ha_init_errors();
863
863
 
864
 
  if (plugin_init(plugins, &defaults_argc, defaults_argv,
865
 
                  ((opt_help) ? true : false), long_options))
 
864
  if (plugin_init(plugins, &defaults_argc, defaults_argv, long_options))
866
865
  {
867
866
    errmsg_printf(ERRMSG_LVL_ERROR, _("Failed to initialize plugins."));
868
867
    unireg_abort(1);
894
893
  po::store(parsed, vm);
895
894
  po::notify(vm);
896
895
 
 
896
  plugin_finalize(plugins);
 
897
 
897
898
  string scheduler_name;
898
899
  if (opt_scheduler)
899
900
  {