← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/functions.cc

  • Committer: Lee Bieber
  • Date: 2010-11-14 23:15:42 UTC
  • mfrom: (1929.1.42 warning-stack-frame)
  • Revision ID: kalebral@gmail.com-20101114231542-fnnu6ydd2p17n582
Merge Monty - fix bug 672372: some functions use > 32k stack

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/generator/functions.cc
21
21
#include "config.h"
22
22
 
23
23
#include "drizzled/generator.h"
24
 
#include "drizzled/function_container.h"
25
24
#include "drizzled/plugin/function.h"
26
25
#include "drizzled/session.h"
27
26
 
35
34
Functions::Functions(Session &arg) :
36
35
  session(arg)
37
36
{
38
 
  function_list.reserve(plugin::Function::getMap().size() + FunctionContainer::getMap().size());
39
 
 
40
 
  std::transform(FunctionContainer::getMap().begin(),
41
 
                 FunctionContainer::getMap().end(),
42
 
                 std::back_inserter(function_list),
43
 
                 boost::bind(&FunctionContainer::Map::value_type::first, _1) );
44
 
 
45
 
  std::transform(plugin::Function::getMap().begin(),
46
 
                 plugin::Function::getMap().end(),
47
 
                 std::back_inserter(function_list),
48
 
                 boost::bind(&plugin::Function::Map::value_type::first, _1) );
49
 
 
50
 
  iter= function_list.begin();
 
37
  udf_iter= plugin::Function::getMap().begin();
51
38
}
52
39
 
53
40
} /* namespace generator */