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 | ca0d9800d19687b67185f211e4625a6c6e7762e5 (patch) | |
| tree | 5c6a6b0abfbabe562b6a8f7e166c53db511eeb71 /mysql-test/r/timezone_grant.result | |
| parent | 334ee656be1063b70fbcbcc6ee0c30c6365e7e4c (diff) | |
| download | mariadb-git-ca0d9800d19687b67185f211e4625a6c6e7762e5.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/r/timezone_grant.result')
| -rw-r--r-- | mysql-test/r/timezone_grant.result | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/r/timezone_grant.result b/mysql-test/r/timezone_grant.result index 685f8007ac7..dfe0b75ee43 100644 --- a/mysql-test/r/timezone_grant.result +++ b/mysql-test/r/timezone_grant.result @@ -20,9 +20,9 @@ convert_tz(b, 'Europe/Moscow', 'UTC') 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); select * from mysql.time_zone_name; -ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysql' +ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name' select Name, convert_tz('2004-10-21 19:00:00', Name, 'UTC') from mysql.time_zone_name; -ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysql' +ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name' delete from mysql.db where user like 'mysqltest\_%'; flush privileges; grant all privileges on test.t1 to mysqltest_1@localhost; @@ -36,7 +36,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') |