diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2008-12-13 19:42:12 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2008-12-13 19:42:12 +0000 |
| commit | 19f859a27e60270f3cdc7e2edc34e88c29536c21 (patch) | |
| tree | 3ca8c469534126c025304d8d96dbeb2b359a6c00 /mysql-test/r/timezone2.result | |
| parent | 5c16a315ca28c18949e27b91cddf0886329d1dd4 (diff) | |
| parent | ba816c14a9bc8012759da9d58f858f1e73bec708 (diff) | |
| download | mariadb-git-19f859a27e60270f3cdc7e2edc34e88c29536c21.tar.gz | |
merge 5.1 --> 5.1-rpl
Diffstat (limited to 'mysql-test/r/timezone2.result')
| -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 49d7bd6542a..2948bb8ecec 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'; |