Commit 1e3f42b2 authored by unknown's avatar unknown
Browse files

5.0-opt -> 5.1-opt merge fixed.

parent 1fbe1fc3

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -32,4 +32,3 @@ rpl_multi_engine : BUG#22583 2006-09-23 lars 
#ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events

ndb_binlog_discover      : bug#21806 2006-08-24

ndb_autodiscover3        : bug#21806
 
udf                      : for GKodinov to fix. Your fix for #21809 stopped working in 5.1 after the merge.

sql/sql_yacc.yy

+3 −4
Original line number Diff line number Diff line
@@ -6372,11 +6372,10 @@ function_call_generic: 
            }

          }

          /* Temporary placing the result of find_udf in $3 */

          $<udf>$= udf;

          lex->current_select->udf_list.push_front(udf);

#endif

        }

        opt_expr_list ')'

        udf_expr_list ')'

        {

          THD *thd= YYTHD;

          LEX *lex= Lex;
@@ -6401,7 +6400,7 @@ function_call_generic: 
          {

#ifdef HAVE_DLOPEN

            /* Retrieving the result of find_udf */

            udf_func *udf= $<udf>3;

            udf_func *udf;

            LEX *lex= Lex;



            if (NULL != (udf= lex->current_select->udf_list.pop()))
@@ -6427,7 +6426,7 @@ function_call_generic: 
            YYABORT;

          }

        }

	| ident '.' ident '(' udf_expr_list ')'

	| ident '.' ident '(' opt_expr_list ')'

	{

          THD *thd= YYTHD;

          Create_qfunc *builder;