diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-17 07:49:26 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-17 07:49:26 +0100 |
| commit | 19ecb948a2a2fffe52f43f892040c566bde61580 (patch) | |
| tree | 55fbd0232c8ce1f9e748352814270ff8993d3291 /sql/item_timefunc.cc | |
| parent | 1118001bfb12808378963f52b5c2b050bbc880e0 (diff) | |
| parent | d689cf23be4f14e0735126b2535254c3d5cc3a62 (diff) | |
| download | mariadb-git-19ecb948a2a2fffe52f43f892040c566bde61580.tar.gz | |
Merge mysql.com:/misc/mysql/32770/50-32770
into mysql.com:/misc/mysql/32770/51-32770
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
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 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; } |