← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/error_message.cc

  • Committer: Brian Aker
  • Date: 2010-01-20 22:32:33 UTC
  • mfrom: (1271.1.5 libnotify-errmsg)
  • Revision ID: brian@gaz-20100120223233-0znraf0mhnbh2bew
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/error_message.cc
67
67
 
68
68
  inline result_type operator()(argument_type handler)
69
69
  {
70
 
    if (handler->errmsg(session, priority, format, ap))
 
70
    va_list handler_ap;
 
71
    va_copy(handler_ap, ap);
 
72
    if (handler->errmsg(session, priority, format, handler_ap))
71
73
    {
72
74
      /* we're doing the errmsg plugin api,
73
75
         so we can't trust the errmsg api to emit our error messages
77
79
      fprintf(stderr,
78
80
              _("errmsg plugin '%s' errmsg() failed"),
79
81
              handler->getName().c_str());
 
82
      va_end(handler_ap);
80
83
      return true;
81
84
    }
 
85
    va_end(handler_ap);
82
86
    return false;
83
87
  }
84
88
};