← 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-04-19 19:23:14 UTC
  • Revision ID: brian@gaz-20100419192314-47vro57tcn607i61
More updates for memory::Root

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/loader.cc
383
383
  if (hash_init(&bookmark_hash, &my_charset_bin, 16, 0, 0,
384
384
                  get_bookmark_hash_key, NULL, HASH_UNIQUE))
385
385
  {
386
 
    free_root(&tmp_root, MYF(0));
 
386
    tmp_root.free_root(MYF(0));
387
387
    return true;
388
388
  }
389
389
 
402
402
      if (module == NULL)
403
403
        return true;
404
404
 
405
 
      free_root(&tmp_root, MYF(memory::MARK_BLOCKS_FREE));
 
405
      tmp_root.free_root(MYF(memory::MARK_BLOCKS_FREE));
406
406
      if (test_plugin_options(&tmp_root, module, argc, argv))
407
407
        continue;
408
408
 
414
414
      {
415
415
        if (plugin_initialize(registry, module))
416
416
        {
417
 
          free_root(&tmp_root, MYF(0));
 
417
          tmp_root.free_root(MYF(0));
418
418
          return true;
419
419
        }
420
420
      }
452
452
                                plugin_list_set);
453
453
  if (load_failed)
454
454
  {
455
 
    free_root(&tmp_root, MYF(0));
 
455
    tmp_root.free_root(MYF(0));
456
456
    return true;
457
457
  }
458
458
 
459
459
  if (skip_init)
460
460
  {
461
 
    free_root(&tmp_root, MYF(0));
 
461
    tmp_root.free_root(MYF(0));
462
462
    return false;
463
463
  }
464
464
 
482
482
  }
483
483
 
484
484
 
485
 
  free_root(&tmp_root, MYF(0));
 
485
  tmp_root.free_root(MYF(0));
486
486
 
487
487
  return false;
488
488
}
541
541
      return true;
542
542
    }
543
543
 
544
 
    free_root(tmp_root, MYF(memory::MARK_BLOCKS_FREE));
 
544
    tmp_root->free_root(MYF(memory::MARK_BLOCKS_FREE));
545
545
    if (plugin_add(registry, tmp_root, library, argc, argv))
546
546
    {
547
547
      registry.removeLibrary(plugin_name);
576
576
  /* Dispose of the memory */
577
577
 
578
578
  hash_free(&bookmark_hash);
579
 
  free_root(&plugin_mem_root, MYF(0));
 
579
  plugin_mem_root.free_root(MYF(0));
580
580
 
581
581
  global_variables_dynamic_size= 0;
582
582
}
1587
1587
      if (opt->flags & PLUGIN_VAR_NOCMDOPT)
1588
1588
        continue;
1589
1589
 
1590
 
      optname= (char*) memdup_root(mem_root, v->key + 1,
1591
 
                                   (optnamelen= v->name_len) + 1);
 
1590
      optname= (char*) mem_root->memdup_root(v->key + 1, (optnamelen= v->name_len) + 1);
1592
1591
    }
1593
1592
 
1594
1593
    /* convert '_' to '-' */
1836
1835
  my_print_help(&*(all_options.begin()));
1837
1836
  my_print_variables(&*(all_options.begin()));
1838
1837
 
1839
 
  free_root(&mem_root, MYF(0));
1840
 
 
 
1838
  mem_root.free_root(MYF(0));
1841
1839
}
1842
1840
 
1843
1841
} /* namespace drizzled */