diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2003-06-25 18:40:31 +0300 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2003-06-25 18:40:31 +0300 |
| commit | 66b60b57afd3700b3a6b9d1036859c9c13307e42 (patch) | |
| tree | 8c915df794527e799e97859c4f7bafdff043e0a5 /sql/sql_yacc.yy | |
| parent | 1d93c8f55098a3cf7279136e047ae9a005005182 (diff) | |
| parent | 0ede29ffd0657d9fe01d8a9f6cc56be6411aba70 (diff) | |
| download | mariadb-git-66b60b57afd3700b3a6b9d1036859c9c13307e42.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-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 af0921825fc..39fa49773f1 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2016,7 +2016,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 ')' |