diff options
author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-07-05 13:22:13 +0300 |
---|---|---|
committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-07-05 13:22:13 +0300 |
commit | ff381a6a33ab4a6b3c773e2b7bb48117a9e113a1 (patch) | |
tree | c7f379ff7d95ee50552e1349c6847d4dfa34beba /mysql-test/r/mysql_upgrade.result | |
parent | 1fc3a87bdbc40e471e6d2dbe4dc04d48810b0eca (diff) | |
parent | 5787f0f20e6773b5e63cc8b9e2c18e4d5df6d708 (diff) | |
download | mariadb-git-ff381a6a33ab4a6b3c773e2b7bb48117a9e113a1.tar.gz |
merge
Diffstat (limited to 'mysql-test/r/mysql_upgrade.result')
-rw-r--r-- | mysql-test/r/mysql_upgrade.result | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index 394beb042a5..58f6ffd4040 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -169,4 +169,46 @@ DROP PROCEDURE testproc; WARNING: NULL values of the 'character_set_client' column ('mysql.proc' table) have been updated with a default value (latin1). Please verify if necessary. WARNING: NULL values of the 'collation_connection' column ('mysql.proc' table) have been updated with a default value (latin1_swedish_ci). Please verify if necessary. WARNING: NULL values of the 'db_collation' column ('mysql.proc' table) have been updated with default values. Please verify if necessary. +# +# Bug #53613: mysql_upgrade incorrectly revokes +# TRIGGER privilege on given table +# +GRANT USAGE ON *.* TO 'user3'@'%'; +GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%'; +Run mysql_upgrade with all privileges on a user +mtr.global_suppressions OK +mtr.test_suppressions OK +mysql.columns_priv OK +mysql.db OK +mysql.event OK +mysql.func OK +mysql.general_log +Error : You can't use locks with log tables. +status : OK +mysql.help_category OK +mysql.help_keyword OK +mysql.help_relation OK +mysql.help_topic OK +mysql.host OK +mysql.ndb_binlog_index OK +mysql.plugin OK +mysql.proc OK +mysql.procs_priv OK +mysql.servers OK +mysql.slow_log +Error : You can't use locks with log tables. +status : OK +mysql.tables_priv OK +mysql.time_zone OK +mysql.time_zone_leap_second OK +mysql.time_zone_name OK +mysql.time_zone_transition OK +mysql.time_zone_transition_type OK +mysql.user OK +SHOW GRANTS FOR 'user3'@'%'; +Grants for user3@% +GRANT USAGE ON *.* TO 'user3'@'%' +GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%' +DROP USER 'user3'@'%'; +End of 5.1 tests The --upgrade-system-tables option was used, databases won't be touched. |