summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <svoj@may.pils.ru>2006-08-11 14:41:07 +0500
committerunknown <svoj@may.pils.ru>2006-08-11 14:41:07 +0500
commit4d8e6faedde14cb372db4c839ce77b1f036fef01 (patch)
tree5f0b1cfa6f95543a39509fb2fb3912722268dc02
parent8a1c99b8f3fddf4e921977953bcdfcfc2c6147a8 (diff)
downloadmariadb-git-4d8e6faedde14cb372db4c839ce77b1f036fef01.tar.gz
Extended a test case for bug#7391.
-rw-r--r--mysql-test/r/grant.result1
-rw-r--r--mysql-test/t/grant.test2
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index 3f3325354ee..7ad2a5033e9 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -426,6 +426,7 @@ revoke all on mysqltest_2.t1 from mysqltest_3@localhost;
revoke all on mysqltest_2.t2 from mysqltest_3@localhost;
grant all on mysqltest_2.* to mysqltest_3@localhost;
grant select on *.* to mysqltest_3@localhost;
+grant select on mysqltest_2.t1 to mysqltest_3@localhost;
flush privileges;
use mysqltest_1;
update mysqltest_2.t1, mysqltest_2.t2 set c=500,d=600;
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test
index a9d52f559ca..73857d8ab69 100644
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
@@ -362,6 +362,8 @@ revoke all on mysqltest_2.t2 from mysqltest_3@localhost;
#test the db/table level privileges
grant all on mysqltest_2.* to mysqltest_3@localhost;
grant select on *.* to mysqltest_3@localhost;
+# Next grant is needed to trigger bug#7391. Do not optimize!
+grant select on mysqltest_2.t1 to mysqltest_3@localhost;
flush privileges;
disconnect conn1;
connect (conn2,localhost,mysqltest_3,,);