diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-02 15:50:35 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-02 15:50:35 +0400 |
| commit | 5a8bd446adf3d1a53b8bc4dd88b3830bf0270865 (patch) | |
| tree | 1c5fa5001e8d82bf01b4bbc2e7c5703499342656 /sql/item_timefunc.cc | |
| parent | 87355a453d4661a75f3b451b30b1867910915675 (diff) | |
| parent | b97b9536c71b3ad5ef521a1f21c527057a0a01c6 (diff) | |
| download | mariadb-git-5a8bd446adf3d1a53b8bc4dd88b3830bf0270865.tar.gz | |
Merge 5.3->5.5
pending merges:
Alexander Barkov 2013-12-02 MDEV-4857 Wrong result of HOUR('1 00:00:00')
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index ab536e58f1c..4b10675c48d 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2142,6 +2142,10 @@ longlong Item_extract::val_int() return 0; neg= ltime.neg ? -1 : 1; + DBUG_ASSERT(ltime.time_type != MYSQL_TIMESTAMP_TIME || ltime.day == 0); + if (ltime.time_type == MYSQL_TIMESTAMP_TIME) + time_to_daytime_interval(<ime); + switch (int_type) { case INTERVAL_YEAR: return ltime.year; case INTERVAL_YEAR_MONTH: return ltime.year*100L+ltime.month; |