diff options
| author | unknown <pem@mysql.comhem.se> | 2003-12-19 19:47:22 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2003-12-19 19:47:22 +0100 |
| commit | bc3b221b161d8c021b3d914492f4b8647b94e2ab (patch) | |
| tree | 8837887a64c7c71a2650292d3018eeedb2909b98 /sql/item_timefunc.cc | |
| parent | 4cd90227696cdc8dced6efec7aad9836bf93dd7c (diff) | |
| download | mariadb-git-bc3b221b161d8c021b3d914492f4b8647b94e2ab.tar.gz | |
Post-merge fixes.
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index ae9d2be80f6..7d28cd10b81 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -1758,10 +1758,7 @@ longlong Item_extract::val_int() case INTERVAL_WEEK: { week_format= current_thd->variables.default_week_format; - return calc_week(<ime, - (week_format & 2) != 0, - (week_format & 1) == 0, - &year); + return calc_week(<ime, week_mode(week_format), &year); } case INTERVAL_DAY: return ltime.day; case INTERVAL_DAY_HOUR: return (long) (ltime.day*100L+ltime.hour)*neg; |