← 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-02-10 22:35:57 UTC
  • mfrom: (1286.1.6 build)
  • Revision ID: brian@gaz-20100210223557-7bhxciexerg9qz2m
Merge bug fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/loader.cc
256
256
  /* Find plugin by name */
257
257
  const plugin::Manifest *manifest= library->getManifest();
258
258
 
 
259
  if (registry.find(manifest->name))
 
260
  {
 
261
    errmsg_printf(ERRMSG_LVL_ERROR, 
 
262
                  _("Plugin '%s' contains the name '%s' in its manifest, which "
 
263
                    "has already been registered.\n"),
 
264
                  library->getName().c_str(),
 
265
                  manifest->name);
 
266
    return true;
 
267
  }
 
268
 
259
269
  tmp= new (std::nothrow) plugin::Module(manifest, library);
260
270
  if (tmp == NULL)
261
271
    return true;
546
556
    if (library == NULL)
547
557
    {
548
558
      errmsg_printf(ERRMSG_LVL_ERROR,
549
 
                    _("Couldn't load plugin library named '%s'."),
 
559
                    _("Couldn't load plugin library named '%s'.\n"),
550
560
                    plugin_name.c_str());
551
561
      return true;
552
562
    }
556
566
    {
557
567
      registry.removeLibrary(plugin_name);
558
568
      errmsg_printf(ERRMSG_LVL_ERROR,
559
 
                    _("Couldn't load plugin named '%s'."),
 
569
                    _("Couldn't load plugin named '%s'.\n"),
560
570
                    plugin_name.c_str());
561
571
      return true;
562
572