← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Jay Pipes
  • Date: 2009-08-20 21:45:52 UTC
  • mfrom: (1093.1.65 plugin-slot-reorg)
  • mto: This revision was merged to the branch mainline in revision 1121.
  • Revision ID: jpipes@serialcoder-20090820214552-qa2fg1ff508b61sm
Merge plugin slot reorganization from monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
384
384
  List<String> *string_list;
385
385
  String *string;
386
386
  Key_part_spec *key_part;
387
 
  Function_builder *udf;
 
387
  const ::drizzled::plugin::Function *udf;
388
388
  TableList *table_list;
389
389
  struct sys_var_with_base variable;
390
390
  enum enum_var_type var_type;
3167
3167
function_call_generic:
3168
3168
          IDENT_sys '('
3169
3169
          {
3170
 
            Function_builder *udf= 0;
3171
 
            udf= find_udf($1.str, $1.length);
 
3170
            plugin::Registry &plugins= plugin::Registry::singleton();
 
3171
            const plugin::Function *udf= plugins.function.get($1.str, $1.length);
3172
3172
 
3173
 
            /* Temporary placing the result of find_udf in $3 */
 
3173
            /* Temporary placing the result of getFunction in $3 */
3174
3174
            $<udf>$= udf;
3175
3175
          }
3176
3176
          opt_udf_expr_list ')'
3195
3195
            }
3196
3196
            else
3197
3197
            {
3198
 
              /* Retrieving the result of find_udf */
3199
 
              Function_builder *udf= $<udf>3;
 
3198
              /* Retrieving the result of slot::Function::get */
 
3199
              const plugin::Function *udf= $<udf>3;
3200
3200
              if (udf)
3201
3201
              {
3202
3202
                item= Create_udf_func::s_singleton.create(session, udf, $4);