diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-07 23:00:33 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-07 23:00:33 +0300 |
| commit | 32755eb50eec5887c8fb69eabf8fc0912661b75a (patch) | |
| tree | c9bde6be21ea745c36c5f515deac2d1c9e5d9a4e /sql/sql_yacc.yy | |
| parent | 838ccf19faf77993f4d820afd1a142241311e472 (diff) | |
| parent | b2670a6722f0f175a5248fa56fcd009d3b71d54a (diff) | |
| download | mariadb-git-32755eb50eec5887c8fb69eabf8fc0912661b75a.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 46c77f39341..0a72e5b7991 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1273,12 +1273,7 @@ create: ; sp_name: - '.' IDENT_sys - { - $$= new sp_name($2); - $$->init_qname(YYTHD); - } - | IDENT_sys '.' IDENT_sys + IDENT_sys '.' IDENT_sys { $$= new sp_name($1, $3); $$->init_qname(YYTHD); @@ -4461,18 +4456,6 @@ simple_expr: { $$= new Item_func_round($3,$5,1); } | TRUE_SYM { $$= new Item_int((char*) "TRUE",1,1); } - | '.' ident '(' udf_expr_list ')' - { - LEX *lex= Lex; - sp_name *name= new sp_name($2); - - name->init_qname(YYTHD); - sp_add_fun_to_lex(Lex, name); - if ($4) - $$= new Item_func_sp(name, *$4); - else - $$= new Item_func_sp(name); - } | ident '.' ident '(' udf_expr_list ')' { LEX *lex= Lex; |