diff options
| author | monty@mysql.com <> | 2004-12-31 03:47:56 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-31 03:47:56 +0200 |
| commit | 5e03ebbcad59ec472af59ce9973bfefcddfe056f (patch) | |
| tree | dd3c89af5e01f80d9172adc65e8df542cd91cb5b /mysql-test/t/timezone2.test | |
| parent | 34d5331cee44cdcb62245779ad486ccbef6bf4c2 (diff) | |
| download | mariadb-git-5e03ebbcad59ec472af59ce9973bfefcddfe056f.tar.gz | |
After merge fixes
Cleanup of mi_print_error() handling
Deleted 'merge' directory
Diffstat (limited to 'mysql-test/t/timezone2.test')
| -rw-r--r-- | mysql-test/t/timezone2.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/timezone2.test b/mysql-test/t/timezone2.test index d185a647921..5b5d2aa774e 100644 --- a/mysql-test/t/timezone2.test +++ b/mysql-test/t/timezone2.test @@ -226,9 +226,9 @@ select convert_tz(b, 'Europe/Moscow', 'UTC') from t1; update t1, t2 set t1.b = convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC') where t1.a = t2.c and t2.d = (select max(d) from t2); # But still these two statements should not work: ---error 1044 +--error 1142 select * from mysql.time_zone_name; ---error 1044 +--error 1142 select Name, convert_tz('2004-10-21 19:00:00', Name, 'UTC') from mysql.time_zone_name; # |