diff options
| author | gluh@gluh.mysql.r18.ru <> | 2003-06-19 14:02:19 +0500 |
|---|---|---|
| committer | gluh@gluh.mysql.r18.ru <> | 2003-06-19 14:02:19 +0500 |
| commit | 289d375f506aab6b46eb605baab8be5283d00c72 (patch) | |
| tree | e791f002cd3e313d2564441aa8afebf1b8b6ce0d /sql/sql_yacc.yy | |
| parent | eb0a4977cae00e2464c55d4f7ba3f4af76f93f90 (diff) | |
| download | mariadb-git-289d375f506aab6b46eb605baab8be5283d00c72.tar.gz | |
SCRUM
Task ID 894:
Backport default_week_format variable to 4.0
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 4a41ad32dcc..0ff09a52a9e 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2002,7 +2002,11 @@ simple_expr: | USER '(' ')' { $$= new Item_func_user(); current_thd->safe_to_cache_query=0; } | WEEK_SYM '(' expr ')' - { $$= new Item_func_week($3,new Item_int((char*) "0",0,1)); } + { + LEX *lex=Lex; + $$= new Item_func_week($3,new Item_int((char*) "0", + lex->thd->variables.default_week_format,1)); + } | WEEK_SYM '(' expr ',' expr ')' { $$= new Item_func_week($3,$5); } | YEAR_SYM '(' expr ')' |