← 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: 2011-02-01 02:51:01 UTC
  • mto: (2132.1.1 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2134.
  • Revision ID: brian@tangent.org-20110201025101-yaj5kkdk2towo6ou
Merge in error message rework. Many error messages are fixed in this patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/module/loader.cc
162
162
 
163
163
  if (registry.find(library->getName()))
164
164
  {
165
 
    errmsg_printf(ERRMSG_LVL_WARN, ER(ER_PLUGIN_EXISTS),
 
165
    errmsg_printf(error::WARN, ER(ER_PLUGIN_EXISTS),
166
166
                  library->getName().c_str());
167
167
    return false;
168
168
  }
173
173
 
174
174
  if (registry.find(manifest->name))
175
175
  {
176
 
    errmsg_printf(ERRMSG_LVL_ERROR, 
 
176
    errmsg_printf(error::ERROR, 
177
177
                  _("Plugin '%s' contains the name '%s' in its manifest, which "
178
178
                    "has already been registered.\n"),
179
179
                  library->getName().c_str(),
190
190
    registry.add(tmp);
191
191
    return false;
192
192
  }
193
 
  errmsg_printf(ERRMSG_LVL_ERROR, ER(ER_CANT_FIND_DL_ENTRY),
 
193
  errmsg_printf(error::ERROR, ER(ER_CANT_FIND_DL_ENTRY),
194
194
                library->getName().c_str());
195
195
  return true;
196
196
}
220
220
  {
221
221
    if (module->getManifest().init(loading_context))
222
222
    {
223
 
      errmsg_printf(ERRMSG_LVL_ERROR,
 
223
      errmsg_printf(error::ERROR,
224
224
                    _("Plugin '%s' init function returned error.\n"),
225
225
                    module->getName().c_str());
226
226
      return true;
459
459
    library= registry.addLibrary(plugin_name, builtin);
460
460
    if (library == NULL)
461
461
    {
462
 
      errmsg_printf(ERRMSG_LVL_ERROR,
 
462
      errmsg_printf(error::ERROR,
463
463
                    _("Couldn't load plugin library named '%s'.\n"),
464
464
                    plugin_name.c_str());
465
465
      return true;
469
469
    if (plugin_add(registry, tmp_root, library, long_options))
470
470
    {
471
471
      registry.removeLibrary(plugin_name);
472
 
      errmsg_printf(ERRMSG_LVL_ERROR,
 
472
      errmsg_printf(error::ERROR,
473
473
                    _("Couldn't load plugin named '%s'.\n"),
474
474
                    plugin_name.c_str());
475
475
      return true;