← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/create.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-03-21 16:49:22 UTC
  • mfrom: (960 drizzle)
  • mto: (968.2.18 mordred)
  • mto: This revision was merged to the branch mainline in revision 971.
  • Revision ID: osullivan.padraig@gmail.com-20090321164922-y4spefz0e826cgda
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/create.cc
1574
1574
Item*
1575
1575
Create_udf_func::create(Session *session, LEX_STRING name, List<Item> *item_list)
1576
1576
{
1577
 
  udf_func *udf= find_udf(name.str, name.length);
 
1577
  Function_builder *udf= find_udf(name.str, name.length);
1578
1578
  assert(udf);
1579
1579
  return create(session, udf, item_list);
1580
1580
}
1581
1581
 
1582
1582
 
1583
1583
Item*
1584
 
Create_udf_func::create(Session *session, udf_func *udf, List<Item> *item_list)
 
1584
Create_udf_func::create(Session *session, Function_builder *udf,
 
1585
                        List<Item> *item_list)
1585
1586
{
1586
1587
  Item_func *func= NULL;
1587
1588
  int arg_count= 0;
1589
1590
  if (item_list != NULL)
1590
1591
    arg_count= item_list->elements;
1591
1592
 
1592
 
  func= udf->create_func(session->mem_root);
 
1593
  func= (*udf)(session->mem_root);
1593
1594
 
1594
1595
  func->set_arguments(*item_list);
1595
1596