← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/loader.cc

  • Committer: Brian Aker
  • Date: 2010-03-24 19:45:37 UTC
  • mfrom: (1377.3.20 pandora-build)
  • Revision ID: brian@gaz-20100324194537-hf3tpibznhozvwl1
Merge monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/loader.cc
154
154
                              const vector<string> &plugins_to_remove);
155
155
static bool plugin_load_list(plugin::Registry &registry,
156
156
                             memory::Root *tmp_root, int *argc, char **argv,
157
 
                             const vector<string> &plugin_list);
 
157
                             const set<string> &plugin_list);
158
158
static int test_plugin_options(memory::Root *, plugin::Module *,
159
159
                               int *, char **);
160
160
static void unlock_variables(Session *session, struct system_variables *vars);
446
446
    tokenize(opt_plugin_remove, plugins_to_remove, ",", true);
447
447
    plugin_prune_list(plugin_list, plugins_to_remove);
448
448
  }
 
449
 
 
450
  /* Uniquify the list */
 
451
  const set<string> plugin_list_set(plugin_list.begin(), plugin_list.end());
449
452
  
450
453
  /* Register all dynamic plugins */
451
454
  load_failed= plugin_load_list(registry, &tmp_root, argc, argv,
452
 
                                plugin_list);
 
455
                                plugin_list_set);
453
456
  if (load_failed)
454
457
  {
455
458
    free_root(&tmp_root, MYF(0));
523
526
*/
524
527
static bool plugin_load_list(plugin::Registry &registry,
525
528
                             memory::Root *tmp_root, int *argc, char **argv,
526
 
                             const vector<string> &plugin_list)
 
529
                             const set<string> &plugin_list)
527
530
{
528
531
  plugin::Library *library= NULL;
529
532
 
530
 
  for (vector<string>::const_iterator iter= plugin_list.begin();
 
533
  for (set<string>::const_iterator iter= plugin_list.begin();
531
534
       iter != plugin_list.end();
532
535
       ++iter)
533
536
  {