1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Previous patch was wrong :(

Browse Source 
Here is 2nd version.
'reduce/reduce conflicts' issue is fixed
This commit is contained in:
gluh@gluh.mysql.r18.ru 2004-04-06 15:00:51 +05:00
parent 03caa47acb
commit 2ae2b946d6
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_yacc.yy
View File

@ -722,7 +722,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
union_clause union_list union_clause union_list
precision subselect_start opt_and charset precision subselect_start opt_and charset
subselect_end select_var_list select_var_list_init help opt_len subselect_end select_var_list select_var_list_init help opt_len
opt_extended_describe curr_user opt_extended_describe
END_OF_INPUT END_OF_INPUT
%type <NONE> %type <NONE>
@ -2685,7 +2685,7 @@ simple_expr:
$$= new Item_func_curtime_local($3); $$= new Item_func_curtime_local($3);
Lex->safe_to_cache_query=0; Lex->safe_to_cache_query=0;
} }
| curr_user | CURRENT_USER optional_braces
{ $$= create_func_current_user(); } { $$= create_func_current_user(); }
| DATE_ADD_INTERVAL '(' expr ',' interval_expr interval ')' | DATE_ADD_INTERVAL '(' expr ',' interval_expr interval ')'
{ $$= new Item_date_add_interval($3,$5,$6,0); } { $$= new Item_date_add_interval($3,$5,$6,0); }
@ -4769,11 +4769,6 @@ ident_or_text:
| TEXT_STRING_sys { $$=$1;} | TEXT_STRING_sys { $$=$1;}
| LEX_HOSTNAME { $$=$1;}; | LEX_HOSTNAME { $$=$1;};
curr_user:
CURRENT_USER {;}
| CURRENT_USER '(' ')' {;}
;
user: user:
ident_or_text ident_or_text
{ {
@ -4791,7 +4786,7 @@ user:
YYABORT; YYABORT;
$$->user = $1; $$->host=$3; $$->user = $1; $$->host=$3;
} }
| curr_user | CURRENT_USER optional_braces
{ {
THD *thd= YYTHD; THD *thd= YYTHD;
if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
@ -4846,7 +4841,6 @@ keyword:
| COMPRESSED_SYM {} | COMPRESSED_SYM {}
| CONCURRENT {} | CONCURRENT {}
| CUBE_SYM {} | CUBE_SYM {}
| CURRENT_USER {}
| DATA_SYM {} | DATA_SYM {}
| DATETIME {} | DATETIME {}
| DATE_SYM {} | DATE_SYM {}