summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorGeorgi Kodinov <kgeorge@mysql.com>2008-12-01 17:43:51 +0200
committerGeorgi Kodinov <kgeorge@mysql.com>2008-12-01 17:43:51 +0200
commit47cff6998ad2655d1c17ce27263c6a4ed713b854 (patch)
treefbffdc714b4d199d0076c861c0d9c7965ab89489 /mysql-test
parent6afd8123a3265feea6ca946556f7499eaefe2808 (diff)
parent7f9e0b9bfb71bd3e47c48bb77f11df76feb1b7ad (diff)
downloadmariadb-git-47cff6998ad2655d1c17ce27263c6a4ed713b854.tar.gz
merged addendum to bug 39920 to 5.1-bugteam
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 32db7ea7fa9..ed15172a0e9 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';