summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorGeorgi Kodinov <kgeorge@mysql.com>2008-12-01 17:41:06 +0200
committerGeorgi Kodinov <kgeorge@mysql.com>2008-12-01 17:41:06 +0200
commit7f9e0b9bfb71bd3e47c48bb77f11df76feb1b7ad (patch)
treef515b0cbaf2cffd848ba633ff62ecd267193c72f /mysql-test
parentc419185fed8a7e5feab99c29f01654028ac93866 (diff)
downloadmariadb-git-7f9e0b9bfb71bd3e47c48bb77f11df76feb1b7ad.tar.gz
addendum to the fix for bug #39920 : post-merge test suite fixes
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/timezone2.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/timezone2.result b/mysql-test/r/timezone2.result
index bb1d764ac8c..e115ce16fa4 100644
--- a/mysql-test/r/timezone2.result
+++ b/mysql-test/r/timezone2.result
@@ -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';