← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/event_observer.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/plugin/event_observer.cc
129
129
      {
130
130
        if (observers->find(event_pos) != observers->end())
131
131
        {
132
 
          errmsg_printf(ERRMSG_LVL_WARN,
 
132
          errmsg_printf(error::WARN,
133
133
                        _("EventObserverList::addEventObserver() Duplicate event position %d for event '%s' from EventObserver plugin '%s'"),
134
134
                        position,
135
135
                        EventObserver::eventName(event), 
196
196
 
197
197
    if (observers != NULL) 
198
198
                {
199
 
                        errmsg_printf(ERRMSG_LVL_WARN,
 
199
                        errmsg_printf(error::WARN,
200
200
                                                                        _("EventObserver::registerTableEvents(): Table already has events registered on it: probable programming error."));
201
201
                        table_share.setTableObservers(NULL);
202
202
      delete observers;
331
331
 
332
332
    observers= session.getSessionObservers();
333
333
                if (observers) { // This should not happed
334
 
                        errmsg_printf(ERRMSG_LVL_WARN,
 
334
                        errmsg_printf(error::WARN,
335
335
                                                                        _("EventObserver::registerSessionEvents(): Session already has events registered on it: probable programming error."));
336
336
                        session.setSessionObservers(NULL);
337
337
                        delete observers;
383
383
      {
384
384
        /* TRANSLATORS: The leading word "EventObserver" is the name
385
385
          of the plugin api, and so should not be translated. */
386
 
        errmsg_printf(ERRMSG_LVL_ERROR,
 
386
        errmsg_printf(error::ERROR,
387
387
                      _("EventIterate event handler '%s' failed for event '%s'"),
388
388
                      handler.second->getName().c_str(), handler.second->eventName(data.event));
389
389