summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorSinisa@sinisa.nasamreza.org <>2004-03-01 21:54:08 +0200
committerSinisa@sinisa.nasamreza.org <>2004-03-01 21:54:08 +0200
commit7f3771bc769a6538ab00aa63d056e9cded4e32b4 (patch)
tree71c56bd3d5139f19b8dffae10cb503af66535c4d /mysql-test
parent9f11123f75c9738f11c6904b2a75e2627b9a3930 (diff)
downloadmariadb-git-7f3771bc769a6538ab00aa63d056e9cded4e32b4.tar.gz
fix for a bug #2953.
When password was granted with a global grant, then granting privileges on database level, without password being specified, will temporary (in memory) set password to ''.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/grant.result6
-rw-r--r--mysql-test/t/grant.test4
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index 0b6ebe9b0ad..ffaf2a83b78 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -165,3 +165,9 @@ drop_user3@localhost, drop_user4@localhost;
drop user drop_user1@localhost, drop_user2@localhost, drop_user3@localhost,
drop_user4@localhost;
drop table t1;
+grant usage on *.* to mysqltest_1@localhost identified by "password";
+grant select, update, insert on test.* to mysqltest@localhost;
+show grants for mysqltest_1@localhost;
+Grants for mysqltest_1@localhost
+GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' IDENTIFIED BY PASSWORD '*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19'
+drop user mysqltest_1@localhost;
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test
index ea7d7fa44af..e6b19e86c90 100644
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
@@ -125,3 +125,7 @@ drop_user3@localhost, drop_user4@localhost;
drop user drop_user1@localhost, drop_user2@localhost, drop_user3@localhost,
drop_user4@localhost;
drop table t1;
+grant usage on *.* to mysqltest_1@localhost identified by "password";
+grant select, update, insert on test.* to mysqltest@localhost;
+show grants for mysqltest_1@localhost;
+drop user mysqltest_1@localhost;