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/r/timezone2.result | |
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/r/timezone2.result')
-rw-r--r-- | mysql-test/r/timezone2.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/timezone2.result b/mysql-test/r/timezone2.result index 56702306b14..040ec866080 100644 --- a/mysql-test/r/timezone2.result +++ b/mysql-test/r/timezone2.result @@ -273,9 +273,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; |