← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/create.cc

  • Committer: Lee Bieber
  • Date: 2011-01-05 19:01:18 UTC
  • mfrom: (2053.2.3 trunk-bug-696188)
  • Revision ID: kalebral@gmail.com-20110105190118-kiq5sez67rvi4kl7
Merge Andrew - fix bug 696188: error handling for drizzle client stdin replacement problems

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/create.cc
20
20
  Functions to create an item. Used by sql_yac.yy
21
21
*/
22
22
 
23
 
#include <config.h>
 
23
#include "config.h"
24
24
#include <drizzled/item/create.h>
25
25
#include <drizzled/item/func.h>
26
26
#include <drizzled/error.h>
27
27
 
28
 
#include <drizzled/function_container.h>
 
28
#include "drizzled/function_container.h"
29
29
 
30
30
#include <drizzled/function/str/binary.h>
31
31
#include <drizzled/function/str/concat.h>
83
83
#include <drizzled/function/math/tan.h>
84
84
#include <drizzled/function/units.h>
85
85
 
86
 
#include <drizzled/function/cast/boolean.h>
87
 
#include <drizzled/function/cast/signed.h>
88
 
#include <drizzled/function/cast/time.h>
89
 
#include <drizzled/function/cast/unsigned.h>
 
86
#include "drizzled/function/cast/boolean.h"
 
87
#include "drizzled/function/cast/signed.h"
 
88
#include "drizzled/function/cast/time.h"
 
89
#include "drizzled/function/cast/unsigned.h"
90
90
 
91
91
using namespace std;
92
92
 
1053
1053
  if (params)
1054
1054
  {
1055
1055
    Item *param;
1056
 
    List<Item>::iterator it(params->begin());
 
1056
    List_iterator<Item> it(*params);
1057
1057
    while ((param= it++))
1058
1058
    {
1059
1059
      if (! param->is_autogenerated_name)
2047
2047
  {
2048
2048
    func_name.assign(func->name.str, func->name.length);
2049
2049
 
2050
 
    FunctionContainer::getMap()[func_name]= func->builder;
 
2050
    FunctionContainer::getMap()[func_name]= func;
2051
2051
  }
2052
2052
 
2053
2053
  return 0;
2057
2057
Create_func *
2058
2058
find_native_function_builder(LEX_STRING name)
2059
2059
{
 
2060
  Native_func_registry *func;
2060
2061
  Create_func *builder= NULL;
2061
2062
 
2062
2063
  string func_name(name.str, name.length);
2063
2064
 
2064
 
  FunctionContainer::Map::iterator func_iter=
 
2065
  NativeFunctionsMap::iterator func_iter=
2065
2066
    FunctionContainer::getMap().find(func_name);
2066
2067
 
2067
2068
  if (func_iter != FunctionContainer::getMap().end())
2068
2069
  {
2069
 
    builder= (*func_iter).second;
 
2070
    func= (*func_iter).second;
 
2071
    builder= func->builder;
2070
2072
  }
2071
2073
 
2072
2074
  return builder;