← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/function.cc

  • Committer: lbieber
  • Date: 2010-09-07 22:29:56 UTC
  • mfrom: (1747.1.3 build)
  • Revision ID: lbieber@orisndriz03-20100907222956-d60u695b7hx3zs0d
Merge Andrew - bug 597778 - Timestamp cannot reliably store leap seconds, so don't try. Leave that to datetime only
Merge Andrew - bug 621862 - Add / clean-up error messages for unireg_abort
Merge Andrew - bug 629563 - Drop the broken --mysql options and Change the --protocol option to accept 'mysql' or 'drizzle' ('mysql' currently default)

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
 
34
 
static plugin::Function::UdfMap udf_registry;
35
 
 
36
 
const plugin::Function::UdfMap &plugin::Function::getMap()
37
 
{
38
 
  return udf_registry;
39
 
}
 
36
typedef boost::unordered_map<string, const plugin::Function *, util::insensitive_hash, util::insensitive_equal_to> UdfMap;
 
37
static UdfMap udf_registry;
40
38
 
41
39
bool plugin::Function::addPlugin(const plugin::Function *udf)
42
40
{
47
45
                  udf->getName().c_str());
48
46
    return true;
49
47
  }
50
 
  std::pair<UdfMap::iterator, bool> ret=
 
48
  pair<UdfMap::iterator, bool> ret=
51
49
    udf_registry.insert(make_pair(udf->getName(), udf));
52
50
  if (ret.second == false)
53
51
  {