diff options
| author | andrey@lmy004. <> | 2006-04-07 12:29:32 +0200 |
|---|---|---|
| committer | andrey@lmy004. <> | 2006-04-07 12:29:32 +0200 |
| commit | 1d816d2cf39b8cadd6ea14ef41f448d0108e9532 (patch) | |
| tree | 1701ee770dbbcfcc5fc203e350ca8c9a5124bba5 /sql/item_timefunc.cc | |
| parent | bdfdd38f606e1988e5ab2f52a07bcd4e3c5c7bfa (diff) | |
| parent | 4a4c459fa367df4b590089b3646834df13c3eb98 (diff) | |
| download | mariadb-git-1d816d2cf39b8cadd6ea14ef41f448d0108e9532.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug17494-real
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index d33db25ca87..99cb7078eba 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2090,7 +2090,7 @@ longlong Item_extract::val_int() switch (int_type) { case INTERVAL_YEAR: return ltime.year; case INTERVAL_YEAR_MONTH: return ltime.year*100L+ltime.month; - case INTERVAL_QUARTER: return ltime.month/3 + 1; + case INTERVAL_QUARTER: return (ltime.month+2)/3; case INTERVAL_MONTH: return ltime.month; case INTERVAL_WEEK: { |