Commit d641028f authored by Sergei Golubchik's avatar Sergei Golubchik

fix func_time.test - WEEK(), WEEKDAY(), WEEKOFYEAR() must require TIME_NO_ZERO_IN_DATE

parent b29bffff
...@@ -1053,7 +1053,7 @@ longlong Item_func_week::val_int() ...@@ -1053,7 +1053,7 @@ longlong Item_func_week::val_int()
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
uint year; uint year;
MYSQL_TIME ltime; MYSQL_TIME ltime;
if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE)) if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE | TIME_NO_ZERO_IN_DATE))
return 0; return 0;
return (longlong) calc_week(&ltime, return (longlong) calc_week(&ltime,
week_mode((uint) args[1]->val_int()), week_mode((uint) args[1]->val_int()),
...@@ -1066,7 +1066,7 @@ longlong Item_func_yearweek::val_int() ...@@ -1066,7 +1066,7 @@ longlong Item_func_yearweek::val_int()
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
uint year,week; uint year,week;
MYSQL_TIME ltime; MYSQL_TIME ltime;
if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE)) if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE | TIME_NO_ZERO_IN_DATE))
return 0; return 0;
week= calc_week(&ltime, week= calc_week(&ltime,
(week_mode((uint) args[1]->val_int()) | WEEK_YEAR), (week_mode((uint) args[1]->val_int()) | WEEK_YEAR),
...@@ -1080,7 +1080,7 @@ longlong Item_func_weekday::val_int() ...@@ -1080,7 +1080,7 @@ longlong Item_func_weekday::val_int()
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
MYSQL_TIME ltime; MYSQL_TIME ltime;
if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE)) if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE | TIME_NO_ZERO_IN_DATE))
return 0; return 0;
return (longlong) calc_weekday(calc_daynr(ltime.year, ltime.month, return (longlong) calc_weekday(calc_daynr(ltime.year, ltime.month,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment