diff options
| author | monty@mysql.com <> | 2004-12-31 00:44:00 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-31 00:44:00 +0200 |
| commit | d71c030587c8638422c5e7d23043430f2733575b (patch) | |
| tree | 77b085cd22eae45e57f4e20f35ecfc231153d656 /mysql-test/r/timezone2.result | |
| parent | 4f4bbfc279800923299df1fefeb2fcd299fcde90 (diff) | |
| download | mariadb-git-d71c030587c8638422c5e7d23043430f2733575b.tar.gz | |
After merge fixes
Diffstat (limited to 'mysql-test/r/timezone2.result')
| -rw-r--r-- | mysql-test/r/timezone2.result | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/timezone2.result b/mysql-test/r/timezone2.result index 203286d4908..56702306b14 100644 --- a/mysql-test/r/timezone2.result +++ b/mysql-test/r/timezone2.result @@ -289,7 +289,9 @@ set time_zone= '+00:00'; set time_zone= 'Europe/Moscow'; select convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC'); convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC') -2004-12-01 09:00:00 +NULL +Warnings: +Warning 1292 Truncated incorrect datetime value: '2004-11-31 12:00:00' select convert_tz(b, 'Europe/Moscow', 'UTC') from t1; convert_tz(b, 'Europe/Moscow', 'UTC') update t1, t2 set t1.b = convert_tz('2004-11-30 12:00:00', 'Europe/Moscow', 'UTC') |