diff options
author | tnurnberg@white.intern.koehntopp.de <> | 2007-12-17 07:49:26 +0100 |
---|---|---|
committer | tnurnberg@white.intern.koehntopp.de <> | 2007-12-17 07:49:26 +0100 |
commit | 4abda87881c34ff79e5015622b3ad4e524eedfa2 (patch) | |
tree | 55fbd0232c8ce1f9e748352814270ff8993d3291 /sql/item_timefunc.cc | |
parent | 2264ca3646bce1fb225632112068ed5c8d92b9d8 (diff) | |
parent | 8651aeb2c49415f458f8f8bb41d9b09ac838929c (diff) | |
download | mariadb-git-4abda87881c34ff79e5015622b3ad4e524eedfa2.tar.gz |
Merge mysql.com:/misc/mysql/32770/50-32770
into mysql.com:/misc/mysql/32770/51-32770
Diffstat (limited to 'sql/item_timefunc.cc')
-rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index e7d513e9d6a..e2aa57d9628 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -3340,6 +3340,8 @@ bool Item_func_last_day::get_date(MYSQL_TIME *ltime, uint fuzzy_date) ltime->day= days_in_month[month_idx]; if ( month_idx == 1 && calc_days_in_year(ltime->year) == 366) ltime->day= 29; + ltime->hour= ltime->minute= ltime->second= 0; + ltime->second_part= 0; ltime->time_type= MYSQL_TIMESTAMP_DATE; return 0; } |