diff options
author | tsmith@ramayana.hindu.god <> | 2008-01-22 15:56:15 -0700 |
---|---|---|
committer | tsmith@ramayana.hindu.god <> | 2008-01-22 15:56:15 -0700 |
commit | 6668554a8d95de344680732703e915217616cc62 (patch) | |
tree | 22de11d4d65b9eb7c56b5e80669f19cf9ff242f4 /sql/item_timefunc.cc | |
parent | c654ac56097e6953c64050502a8e380cb30324fa (diff) | |
parent | c6a01870bc58a2ab47f1063ff6d091ee224e0410 (diff) | |
download | mariadb-git-6668554a8d95de344680732703e915217616cc62.tar.gz |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
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 ce760b8fd2a..a0beadcd481 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -3360,6 +3360,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; } |