← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/parser.cc

  • Committer: Olaf van der Spek
  • Date: 2011-02-28 14:09:50 UTC
  • mfrom: (2207 bootstrap)
  • mto: (2209.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2210.
  • Revision ID: olafvdspek@gmail.com-20110228140950-2nu0hyzhuww3wssx
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/parser.cc
22
22
#include <drizzled/parser.h>
23
23
#include <drizzled/alter_info.h>
24
24
#include <drizzled/alter_drop.h>
 
25
#include <drizzled/item/subselect.h>
25
26
 
26
27
namespace drizzled {
27
28
namespace parser {
178
179
 
179
180
Item* reserved_keyword_function(Session *session, const std::string &name, List<Item> *item_list)
180
181
{
181
 
  const plugin::Function *udf= plugin::Function::get(name.c_str(), name.length());
182
 
  Item *item= NULL;
 
182
  const plugin::Function *udf= plugin::Function::get(name);
183
183
 
184
184
  if (udf)
185
185
  {
186
 
    item= Create_udf_func::s_singleton.create(session, udf, item_list);
187
 
  } else {
188
 
    my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "FUNCTION", name.c_str());
 
186
    return Create_udf_func::s_singleton.create(session, udf, item_list);
189
187
  }
190
188
 
191
 
  return item;
 
189
  my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "FUNCTION", name.c_str());
 
190
 
 
191
  return NULL;
192
192
}
193
193
 
194
194
/**