diff options
| author | kostja@bodhi.local <> | 2006-07-07 22:09:43 +0400 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-07-07 22:09:43 +0400 |
| commit | 7bf73ac3e5359e7d9282cdb65369bd4a5cafc882 (patch) | |
| tree | 9baffd6140dc110806fd9c5531adf2e4f85fb6d0 /sql/sql_yacc.yy | |
| parent | 31ddb041058f6ee0ad0527fa2ff5ea15bae12e36 (diff) | |
| parent | b429748fabb7e3fe6c3dd0271b2d0660c87120ee (diff) | |
| download | mariadb-git-7bf73ac3e5359e7d9282cdb65369bd4a5cafc882.tar.gz | |
Merge bodhi.local:/opt/local/work/mysql-5.0-root
into bodhi.local:/opt/local/work/mysql-5.0-runtime
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 426c996ab01..deac9cb5c40 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4453,7 +4453,10 @@ simple_expr: Lex->safe_to_cache_query=0; } | CURRENT_USER optional_braces - { $$= create_func_current_user(); } + { + $$= new Item_func_current_user(Lex->current_context()); + Lex->safe_to_cache_query= 0; + } | DATE_ADD_INTERVAL '(' expr ',' interval_expr interval ')' { $$= new Item_date_add_interval($3,$5,$6,0); } | DATE_SUB_INTERVAL '(' expr ',' interval_expr interval ')' @@ -4810,7 +4813,7 @@ simple_expr: | UNIX_TIMESTAMP '(' expr ')' { $$= new Item_func_unix_timestamp($3); } | USER '(' ')' - { $$= new Item_func_user(FALSE); Lex->safe_to_cache_query=0; } + { $$= new Item_func_user(); Lex->safe_to_cache_query=0; } | UTC_DATE_SYM optional_braces { $$= new Item_func_curdate_utc(); Lex->safe_to_cache_query=0;} | UTC_TIME_SYM optional_braces |