diff options
| author | serg@sergbook.mysql.com <> | 2004-12-31 15:26:24 +0100 |
|---|---|---|
| committer | serg@sergbook.mysql.com <> | 2004-12-31 15:26:24 +0100 |
| commit | a04fc26c5429284ddae3b5aa19220b057d84b302 (patch) | |
| tree | 928b06c231edee4cb95ace87ed30e879e3dcb0fb /mysql-test/r/timezone2.result | |
| parent | 849d1203ffb0a68ccec2e9e6e1baba00b2fbe536 (diff) | |
| parent | 45ce994e5dc31c6eb802c3b8eb8955c320a4c111 (diff) | |
| download | mariadb-git-a04fc26c5429284ddae3b5aa19220b057d84b302.tar.gz | |
manually merged
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 040ec866080..94d660c90d0 100644 --- a/mysql-test/r/timezone2.result +++ b/mysql-test/r/timezone2.result @@ -297,9 +297,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\_%'; |