diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/roles/set_default_role_invalid.test | 9 | ||||
| -rw-r--r-- | mysql-test/suite/roles/set_role-recursive.result | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/suite/roles/set_default_role_invalid.test b/mysql-test/suite/roles/set_default_role_invalid.test index 6af59bce95c..a72d035a524 100644 --- a/mysql-test/suite/roles/set_default_role_invalid.test +++ b/mysql-test/suite/roles/set_default_role_invalid.test @@ -90,7 +90,7 @@ change_user b; SELECT CURRENT_ROLE; SET ROLE r2; SELECT CURRENT_ROLE; ---error 1044 +--error ER_DBACCESS_DENIED_ERROR SET DEFAULT ROLE r1 FOR a; SET ROLE r2; SELECT CURRENT_ROLE; @@ -104,7 +104,7 @@ GRANT SELECT ON mysql.* TO b; change_user b; SHOW GRANTS FOR b; --echo # Select_priv is granted ---error ER_INVALID_ROLE +--error ER_DBACCESS_DENIED_ERROR SET DEFAULT ROLE r1 FOR a; # Handling CURRENT_ROLE SELECT CURRENT_ROLE; @@ -115,10 +115,10 @@ SET DEFAULT ROLE current_role FOR current_user; --error ER_INVALID_ROLE SET DEFAULT ROLE invalid_role; # Handling of non-existing role for user ---error ER_INVALID_ROLE +--error ER_DBACCESS_DENIED_ERROR SET DEFAULT ROLE invalid_role FOR a; # Special case of handling the none role with select_priv --- error 1044 +-- error ER_DBACCESS_DENIED_ERROR SET DEFAULT ROLE none FOR a; --echo # change user root @@ -148,6 +148,7 @@ change_user a; SELECT CURRENT_ROLE; change_user root; +--sorted_result SELECT user, host, default_role FROM mysql.user where user='a' or user='b'; DROP ROLE r1, r2; DROP USER a, b; diff --git a/mysql-test/suite/roles/set_role-recursive.result b/mysql-test/suite/roles/set_role-recursive.result index 1a07ddc9d17..b0d79377183 100644 --- a/mysql-test/suite/roles/set_role-recursive.result +++ b/mysql-test/suite/roles/set_role-recursive.result @@ -66,7 +66,7 @@ Grants for test_user@localhost GRANT USAGE ON *.* TO 'test_user'@'localhost' GRANT test_role1 TO 'test_user'@'localhost' set role test_role2; -ERROR OP000: User `test_user@localhost` has not been granted a role `test_role2` +ERROR OP000: User `test_user@localhost` has not been granted role `test_role2` select current_user(), current_role(); current_user() current_role() test_user@localhost NULL |