diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-17 07:54:32 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-17 07:54:32 +0100 |
| commit | abae2dcc480ae057e3a93364af1d6676dc2e9484 (patch) | |
| tree | b2b9bcde6b1b4a778be694aa473a69867631ffec /sql/item_timefunc.cc | |
| parent | fe28526ba14cfe5ea073c37eda4d351cf723ef69 (diff) | |
| parent | d689cf23be4f14e0735126b2535254c3d5cc3a62 (diff) | |
| download | mariadb-git-abae2dcc480ae057e3a93364af1d6676dc2e9484.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/32770/50-32770
sql/item_timefunc.cc:
Auto merged
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 4ddc788b182..04060d190a0 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -3415,6 +3415,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; } |