From: Date: December 1 2008 4:41pm
Subject: bzr commit into mysql-5.0-bugteam branch (kgeorge:2731) Bug#39920
List-Archive: http://lists.mysql.com/commits/60291
X-Bug: 39920
Message-Id: <200812011541.mB1FfubO002317@magare.gmz>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/kgeorge/mysql/work/B39920-merge-5.0-bugteam/ based on revid:kgeorge@stripped

 2731 Georgi Kodinov	2008-12-01
      addendum to the fix for bug #39920 : post-merge test suite fixes
modified:
  mysql-test/r/timezone2.result

=== modified file 'mysql-test/r/timezone2.result'
--- a/mysql-test/r/timezone2.result	2006-11-01 14:35:35 +0000
+++ b/mysql-test/r/timezone2.result	2008-12-01 15:41:06 +0000
@@ -110,7 +110,7 @@ i	ts
 362793610	1981-07-01 04:00:00
 select from_unixtime(362793609);
 from_unixtime(362793609)
-1981-07-01 03:59:60
+1981-07-01 03:59:59
 drop table t1;
 create table t1 (ts timestamp);
 set time_zone='UTC';