diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-17 08:10:13 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-17 08:10:13 +0100 |
| commit | f318e43fd5f4b4b385c1fbbcb0f770aaf8b7161a (patch) | |
| tree | 99f3f7e422ca8326bb03c48308a04f9db4881ac7 /sql/item_timefunc.cc | |
| parent | 734c6286e9b78927aaec9ff9f433747b92a7db57 (diff) | |
| parent | 19ecb948a2a2fffe52f43f892040c566bde61580 (diff) | |
| download | mariadb-git-f318e43fd5f4b4b385c1fbbcb0f770aaf8b7161a.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/32770/51-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 3d4a6de83ac..56a6480d859 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -3344,6 +3344,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; } |