~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/module/registry.h

  • Committer: Brian Aker
  • Date: 2011-02-01 20:31:20 UTC
  • mfrom: (2133.1.4 drizzle-build)
  • Revision ID: brian@tangent.org-20110201203120-vmp2abdbjjaua218
Merge in all of the error cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
113
113
                   plugin_name.begin(), ::tolower);
114
114
    if (plugin_registry.find(std::make_pair(plugin_type, plugin_name)) != plugin_registry.end())
115
115
    {
116
 
      errmsg_printf(ERRMSG_LVL_ERROR,
 
116
      errmsg_printf(error::ERROR,
117
117
                    _("Loading plugin %s failed: a %s plugin by that name "
118
118
                      "already exists.\n"),
119
119
                    plugin->getTypeName().c_str(),
127
127
 
128
128
    if (failed)
129
129
    {
130
 
      errmsg_printf(ERRMSG_LVL_ERROR,
 
130
      errmsg_printf(error::ERROR,
131
131
                    _("Fatal error: Failed initializing %s::%s plugin.\n"),
132
132
                    plugin->getTypeName().c_str(),
133
133
                    plugin->getName().c_str());