diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-11-07 16:11:59 +0100 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-11-07 16:11:59 +0100 |
| commit | 5aafeb3f0a50a5c7e6ec6b2a107fad5e9fb37e53 (patch) | |
| tree | 4cff38aa5ab26f3aeecda89c7afa7f243780dc07 /sql | |
| parent | 2f0444e0d95a541a04516e0a63aee93966d06a65 (diff) | |
| parent | cc0e54656714fec37cd74e03fe781f7571ed194e (diff) | |
| download | mariadb-git-5aafeb3f0a50a5c7e6ec6b2a107fad5e9fb37e53.tar.gz | |
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into kindahl-laptop.dnsalias.net:/home/bk/b28086-mysql-5.1-rpl
Diffstat (limited to 'sql')
| -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 109e8f5434f..bb25d9c4c7f 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 ')' |