← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/module/loader.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/module/loader.cc
383
383
*/
384
384
bool plugin_init(module::Registry &registry,
385
385
                 int *argc, char **argv,
386
 
                 bool skip_init,
387
386
                 po::options_description &long_options)
388
387
{
389
 
  module::Module *module;
390
388
  memory::Root tmp_root(4096);
391
389
 
392
390
  if (initialized)
453
451
    return true;
454
452
  }
455
453
 
456
 
  if (skip_init)
457
 
  {
458
 
    tmp_root.free_root(MYF(0));
459
 
    return false;
460
 
  }
 
454
  tmp_root.free_root(MYF(0));
 
455
 
 
456
  return false;
 
457
}
 
458
 
 
459
void plugin_finalize(module::Registry &registry)
 
460
{
461
461
 
462
462
  /*
463
463
    Now we initialize all remaining plugins
467
467
    
468
468
  while (modules != registry.getModulesMap().end())
469
469
  {
470
 
    module= (*modules).second;
 
470
    module::Module *module= (*modules).second;
471
471
    ++modules;
472
472
    if (module->isInited == false)
473
473
    {
477
477
        delete_module(module);
478
478
    }
479
479
  }
480
 
 
481
 
 
482
 
  tmp_root.free_root(MYF(0));
483
 
 
484
 
  return false;
485
480
}
486
481
 
487
482
class PrunePlugin :