diff options
| author | gkodinov/kgeorge@macbook.gmz <> | 2006-11-20 12:46:47 +0200 |
|---|---|---|
| committer | gkodinov/kgeorge@macbook.gmz <> | 2006-11-20 12:46:47 +0200 |
| commit | 2c82b5a97a2191124d8955d0c791992e650cf4fc (patch) | |
| tree | a58e6987254c6640aded3aa4f35b7b8149a22261 /sql | |
| parent | 989117071a88569d374e9c3291d82479a0a19699 (diff) | |
| download | mariadb-git-2c82b5a97a2191124d8955d0c791992e650cf4fc.tar.gz | |
5.0-opt -> 5.1-opt merge fixed.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 28230fcf06d..26dc484059e 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -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; |