From: Date: December 10 2007 9:17am Subject: bk commit into 5.0 tree (tnurnberg:1.2597) BUG#32770 List-Archive: http://lists.mysql.com/commits/39624 X-Bug: 32770 Message-Id: <200712100817.lBA8HL6m013118@white.intern.koehntopp.de> Below is the list of changes that have just been committed into a local 5.0 repository of tnurnberg. When tnurnberg does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-12-10 09:17:18+01:00, tnurnberg@stripped +3 -0 Bug#32770: LAST_DAY() returns a DATE, but somehow internally keeps track of the TIME. LAST_DAY() says it returns a DATE, not a DATETIME, but didn't zero the time fields. Adapted from a patch kindly supplied by Claudio Cherubino. mysql-test/r/func_time.result@stripped, 2007-12-10 09:17:16+01:00, tnurnberg@stripped +3 -0 show that LAST_DAY() returns only a DATE, not a DATETIME mysql-test/t/func_time.test@stripped, 2007-12-10 09:17:17+01:00, tnurnberg@stripped +7 -0 show that LAST_DAY() returns only a DATE, not a DATETIME sql/item_timefunc.cc@stripped, 2007-12-10 09:17:17+01:00, tnurnberg@stripped +2 -0 zero time-fields as we return only a DATE diff -Nrup a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result --- a/mysql-test/r/func_time.result 2007-11-16 17:43:13 +01:00 +++ b/mysql-test/r/func_time.result 2007-12-10 09:17:16 +01:00 @@ -1282,4 +1282,7 @@ DATE_ADD('20071108', INTERVAL 1 DA select DATE_ADD(20071108, INTERVAL 1 DAY); DATE_ADD(20071108, INTERVAL 1 DAY) 2007-11-09 +select LAST_DAY('2007-12-06 08:59:19.05') - INTERVAL 1 SECOND; +LAST_DAY('2007-12-06 08:59:19.05') - INTERVAL 1 SECOND +2007-12-30 23:59:59 End of 5.0 tests diff -Nrup a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test --- a/mysql-test/t/func_time.test 2007-11-16 17:43:14 +01:00 +++ b/mysql-test/t/func_time.test 2007-12-10 09:17:17 +01:00 @@ -797,4 +797,11 @@ select DATE_ADD(20071108181000, INTERV select DATE_ADD('20071108', INTERVAL 1 DAY); select DATE_ADD(20071108, INTERVAL 1 DAY); +# +# Bug#32770: LAST_DAY() returns a DATE, but somehow internally keeps +# track of the TIME. +# + +select LAST_DAY('2007-12-06 08:59:19.05') - INTERVAL 1 SECOND; + --echo End of 5.0 tests diff -Nrup a/sql/item_timefunc.cc b/sql/item_timefunc.cc --- a/sql/item_timefunc.cc 2007-11-14 14:24:02 +01:00 +++ b/sql/item_timefunc.cc 2007-12-10 09:17:17 +01:00 @@ -3411,6 +3411,8 @@ bool Item_func_last_day::get_date(MYSQL_ 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; }