diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-12-01 17:43:51 +0200 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-12-01 17:43:51 +0200 |
| commit | 6969832813b8b86738afc5c48e10a19dfa63f3e0 (patch) | |
| tree | fbffdc714b4d199d0076c861c0d9c7965ab89489 /mysql-test | |
| parent | 8f8183eee3e78381ff2649427670583a51e75036 (diff) | |
| parent | f0c49a6a7dec6bd53ad5575c07ac31a1e27c8a16 (diff) | |
| download | mariadb-git-6969832813b8b86738afc5c48e10a19dfa63f3e0.tar.gz | |
merged addendum to bug 39920 to 5.1-bugteam
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/timezone2.result | 2 |
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'; |