now GRANT db.* ... compares patterns correctly to prevent privilege escalation

1 files changed, 12 insertions, 13 deletions

diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result
index 1586375c7d8..d49b9daee85 100644
--- a/mysql-test/r/grant2.result
+++ b/mysql-test/r/grant2.result
@@ -5,20 +5,19 @@ grant all privileges on `my\_%`.* to mysqltest_1@localhost with grant option;
 select current_user();
 current_user()
 mysqltest_1@localhost
-grant all privileges on `my\_1`.* to mysqltest_9@localhost with grant option;
-ERROR 42000: Access denied for user: 'mysqltest_1@localhost' to database 'my\_1'
-grant all privileges on `my_%`.* to mysqltest_2@localhost with grant option;
-select current_user();
-current_user()
-mysqltest_2@localhost
-grant all privileges on `mysql`.* to mysqltest_3@localhost with grant option;
-select current_user();
-current_user()
-mysqltest_3@localhost
+grant all privileges on `my\_1`.* to mysqltest_2@localhost with grant option;
+grant all privileges on `my_%`.* to mysqltest_3@localhost with grant option;
+ERROR 42000: Access denied for user: 'mysqltest_1@localhost' to database 'my_%'
+show grants for mysqltest_1@localhost;
+Grants for mysqltest_1@localhost
+GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
+GRANT ALL PRIVILEGES ON `my\_%`.* TO 'mysqltest_1'@'localhost' WITH GRANT OPTION
+show grants for mysqltest_2@localhost;
+Grants for mysqltest_2@localhost
+GRANT USAGE ON *.* TO 'mysqltest_2'@'localhost'
+GRANT ALL PRIVILEGES ON `my\_1`.* TO 'mysqltest_2'@'localhost' WITH GRANT OPTION
 show grants for mysqltest_3@localhost;
-Grants for mysqltest_3@localhost
-GRANT USAGE ON *.* TO 'mysqltest_3'@'localhost'
-GRANT ALL PRIVILEGES ON `mysql`.* TO 'mysqltest_3'@'localhost' WITH GRANT OPTION
+ERROR 42000: There is no such grant defined for user 'mysqltest_3' on host 'localhost'
 delete from mysql.user where user like 'mysqltest\_%';
 delete from mysql.db where user like 'mysqltest\_%';
 flush privileges;