diff options
| author | unknown <serg@sergbook.mysql.com> | 2004-12-31 11:52:14 +0100 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2004-12-31 11:52:14 +0100 |
| commit | 5eaf65ab4be77911eb03cceefac9ecea48c25f71 (patch) | |
| tree | e4e588771f15003e0c2b5df5cbc1cafeb3530324 /mysql-test/r/timezone2.result | |
| parent | 379613c3e274147f240a25b10eb677e3ee77aa34 (diff) | |
| download | mariadb-git-5eaf65ab4be77911eb03cceefac9ecea48c25f71.tar.gz | |
post-merge
mysql-test/r/grant2.result:
new test case
mysql-test/r/variables.result:
don't fail w/o innodb
mysql-test/t/grant2.test:
new test case
mysql-test/t/multi_update.test:
don't fail w/o innodb
mysql-test/t/variables.test:
don't fail w/o innodb
sql/sql_acl.cc:
cleanup
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 1c98fd18a08..a1a2fec739f 100644 --- a/mysql-test/r/timezone2.result +++ b/mysql-test/r/timezone2.result @@ -295,9 +295,9 @@ convert_tz(b, 'Europe/Moscow', 'UTC') update t1, t2 set t1.b = convert_tz('2004-11-30 12: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: select command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name' +ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name' select Name, convert_tz('2004-11-30 12:00:00', Name, 'UTC') from mysql.time_zone_name; -ERROR 42000: select command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name' +ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name' delete from mysql.user where user like 'mysqltest\_%'; delete from mysql.db where user like 'mysqltest\_%'; delete from mysql.tables_priv where user like 'mysqltest\_%'; |