diff options
| author | unknown <jimw@mysql.com> | 2005-04-04 16:34:24 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-04-04 16:34:24 -0700 |
| commit | 754874fd003c922b8f2d52e38149b153702ad040 (patch) | |
| tree | 5c6a6b0abfbabe562b6a8f7e166c53db511eeb71 /mysql-test/t/timezone_grant.test | |
| parent | 4cfd77d986455d6616d5f90d3cc0d7670f50d042 (diff) | |
| download | mariadb-git-754874fd003c922b8f2d52e38149b153702ad040.tar.gz | |
Fix merge of tests that were split out of other test files
mysql-test/r/ctype_ucs_binlog.result:
Update results
mysql-test/r/timezone_grant.result:
Update results
mysql-test/r/user_var-binlog.result:
Update results
mysql-test/t/ctype_ucs_binlog.test:
Update binlog starting position
mysql-test/t/timezone_grant.test:
Update error numbers
mysql-test/t/user_var-binlog.test:
Update binlog starting position
Diffstat (limited to 'mysql-test/t/timezone_grant.test')
| -rw-r--r-- | mysql-test/t/timezone_grant.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/timezone_grant.test b/mysql-test/t/timezone_grant.test index 501315668f5..f586ba0c5fe 100644 --- a/mysql-test/t/timezone_grant.test +++ b/mysql-test/t/timezone_grant.test @@ -28,9 +28,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; # |