mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

5.0-opt -> 5.1-opt merge fixed.

Browse source
This commit is contained in:
gkodinov/kgeorge@macbook.gmz 2006-11-20 12:46:47 +02:00
parent 989117071a
commit 2c82b5a97a
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/t/disabled.def
View file

@ -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.

7
sql/sql_yacc.yy
View file

@ -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;