← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/function.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/function.cc
43
43
{
44
44
  if (FunctionContainer::getMap().find(udf->getName()) != FunctionContainer::getMap().end())
45
45
  {
46
 
    errmsg_printf(ERRMSG_LVL_ERROR,
 
46
    errmsg_printf(error::ERROR,
47
47
                  _("A function named %s already exists!\n"),
48
48
                  udf->getName().c_str());
49
49
    return true;
51
51
 
52
52
  if (udf_registry.find(udf->getName()) != udf_registry.end())
53
53
  {
54
 
    errmsg_printf(ERRMSG_LVL_ERROR,
 
54
    errmsg_printf(error::ERROR,
55
55
                  _("A function named %s already exists!\n"),
56
56
                  udf->getName().c_str());
57
57
    return true;
61
61
    udf_registry.insert(make_pair(udf->getName(), udf));
62
62
  if (ret.second == false)
63
63
  {
64
 
    errmsg_printf(ERRMSG_LVL_ERROR,
 
64
    errmsg_printf(error::ERROR,
65
65
                  _("Could not add Function!\n"));
66
66
    return true;
67
67
  }