← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/syslog/function.cc

  • Committer: Mark Atwood
  • Date: 2011-12-20 02:32:53 UTC
  • mfrom: (2469.1.1 drizzle-build)
  • Revision ID: me@mark.atwood.name-20111220023253-bvu0kr14kwsdvz7g
merge lp:~brianaker/drizzle/deprecate-pbms

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/syslog/function.cc
22
22
#include <drizzled/gettext.h>
23
23
#include <drizzled/session.h>
24
24
 
25
 
#include "function.h"
26
 
#include "wrap.h"
 
25
#include <plugin/syslog/function.h>
 
26
#include <plugin/syslog/wrap.h>
27
27
 
28
28
namespace drizzle_plugin
29
29
{
57
57
    return 0;
58
58
  }
59
59
 
60
 
  WrapSyslog::singleton().log(syslog_facility, syslog_priority, "%s", syslog_string);
 
60
  WrapSyslog::singleton().log(syslog_facility, drizzled::error::priority_t(syslog_priority), "%s", syslog_string);
61
61
 
62
62
  null_value= 0;
63
63
  return args[2]->val_str(s);