← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/function.cc

  • Committer: David Shrewsbury
  • Date: 2010-10-11 17:20:14 UTC
  • mfrom: (1838 trunk-drizzle)
  • mto: (1838.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1839.
  • Revision ID: shrewsbury.dave@gmail.com-20101011172014-sij1m2doi2fl2duo
Merge from trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/function.cc
28
28
 
29
29
#include "drizzled/util/string.h"
30
30
 
 
31
using namespace std;
 
32
 
31
33
namespace drizzled
32
34
{
33
35
 
47
49
                  udf->getName().c_str());
48
50
    return true;
49
51
  }
50
 
  std::pair<UdfMap::iterator, bool> ret=
 
52
  pair<UdfMap::iterator, bool> ret=
51
53
    udf_registry.insert(make_pair(udf->getName(), udf));
52
54
  if (ret.second == false)
53
55
  {