summaryrefslogtreecommitdiff
path: root/mysql-test/r/grant.result
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2010-10-19 11:26:45 +0200
committerJon Olav Hauglid <jon.hauglid@oracle.com>2010-10-19 11:26:45 +0200
commit8f73bddc9adc7c01023204af56f13bdb25a4b8c4 (patch)
tree6d937bc05454572322130965158862fa568a4c55 /mysql-test/r/grant.result
parent248625d910dda9848c99f28c5c73c4e4a9bfc4ae (diff)
parent87b91752f9951aae73d03b27088d8aca0b6b2b30 (diff)
downloadmariadb-git-8f73bddc9adc7c01023204af56f13bdb25a4b8c4.tar.gz
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'mysql-test/r/grant.result')
-rw-r--r--mysql-test/r/grant.result11
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index 37074e9a32f..60053b29125 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -1575,6 +1575,17 @@ DROP USER 'testbug'@localhost;
DROP TABLE db2.t1;
DROP DATABASE db1;
DROP DATABASE db2;
+#
+# Bug #36742
+#
+grant usage on Foo.* to myuser@Localhost identified by 'foo';
+grant select on Foo.* to myuser@localhost;
+select host,user from mysql.user where User='myuser';
+host user
+localhost myuser
+revoke select on Foo.* from myuser@localhost;
+delete from mysql.user where User='myuser';
+flush privileges;
#########################################################################
#
# Bug#38347: ALTER ROUTINE privilege allows SHOW CREATE TABLE.