summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorunknown <ram@gw.mysql.r18.ru>2004-12-02 13:34:30 +0400
committerunknown <ram@gw.mysql.r18.ru>2004-12-02 13:34:30 +0400
commit491a3d90a99c3849c220592b4f8ff29de8484de9 (patch)
treec596bb93ad8484a3ee8304221ae337a4af3061c8 /tests
parent6f20687e202303fe61a4e827fe74a5133e57337a (diff)
downloadmariadb-git-491a3d90a99c3849c220592b4f8ff29de8484de9.tar.gz
Fixes (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv
bug #6933: error in the tests/grant.pl test). mysql-test/r/grant.result: A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv). mysql-test/t/grant.test: A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv). sql/sql_acl.cc: A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv). The problem is that we use whole key length (including 'Column_name' keypart) during scanning the 'columns_priv' table in case of revoke_grant. tests/grant.pl: A fix (bug #6933: error in the tests/grant.pl test).
Diffstat (limited to 'tests')
-rw-r--r--tests/grant.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/grant.pl b/tests/grant.pl
index eb2d00f3e1d..cd6a2eb80de 100644
--- a/tests/grant.pl
+++ b/tests/grant.pl
@@ -74,9 +74,9 @@ safe_query("revoke select(user) on mysql.user from $user");
safe_query("grant select on *.* to $user");
safe_query("set password FOR ${opt_user}2\@$opt_host = password('test')",1);
-safe_query("set password FOR $opt_user=password('test')");
+safe_query("set password FOR $opt_user\@$opt_host=password('test')");
user_connect(1);
-safe_query("set password FOR $opt_user=''");
+safe_query("set password FOR $opt_user\@$opt_host=''");
user_connect(0);
user_query("select * from mysql.user where user = '$opt_user'");
user_query("select * from mysql.db where user = '$opt_user'");