diff options
| author | mkindahl@dl145h.mysql.com <> | 2007-11-14 11:07:30 +0100 |
|---|---|---|
| committer | mkindahl@dl145h.mysql.com <> | 2007-11-14 11:07:30 +0100 |
| commit | 6b5cb11dba4426441358b7f4dd897dc2b6eb6494 (patch) | |
| tree | d9b883b86c3d3cfcacb0ef412b5c6daedc325184 /sql/sql_yacc.yy | |
| parent | e4e8cb3a900257e13faede7453391aa962de1650 (diff) | |
| parent | 66cb03195c49d01dd0fd5ef28f0b46e40be51e73 (diff) | |
| download | mariadb-git-6b5cb11dba4426441358b7f4dd897dc2b6eb6494.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-new-rpl
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b337f82dec3..5d4ac9c75b3 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -6745,6 +6745,7 @@ function_call_keyword: | CURRENT_USER optional_braces { $$= new (YYTHD->mem_root) Item_func_current_user(Lex->current_context()); + Lex->set_stmt_unsafe(); Lex->safe_to_cache_query= 0; } | DATE_SYM '(' expr ')' @@ -6790,6 +6791,7 @@ function_call_keyword: | USER '(' ')' { $$= new (YYTHD->mem_root) Item_func_user(); + Lex->set_stmt_unsafe(); Lex->safe_to_cache_query=0; } | YEAR_SYM '(' expr ')' |