bzr commit into mysql-5.1-bugteam branch (Dmitry.Shulga:3530) Bug#19828 Bug#36742

[Dmitry Shulga]

#At file:///Users/shulga/projects/mysql/5.1-bugteam-bug36742/ based on revid:luis.soares@stripped

 3530 Dmitry Shulga	2010-10-14
      Follow up for bug#36742. Removed test case for bug#19828
      because of currently hostname stored in db in lowercase.

    modified:
      mysql-test/r/grant3.result
      mysql-test/t/grant3.test
=== modified file 'mysql-test/r/grant3.result'
--- a/mysql-test/r/grant3.result	2009-10-20 06:17:57 +0000
+++ b/mysql-test/r/grant3.result	2010-10-14 14:37:17 +0000
@@ -16,128 +16,6 @@ delete from mysql.db where user like 'my
 delete from mysql.tables_priv where user like 'mysqltest\_%';
 delete from mysql.columns_priv where user like 'mysqltest\_%';
 flush privileges;
-grant select on test.* to CUser@localhost;
-grant select on test.* to CUser@LOCALHOST;
-flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-user	host
-CUser	LOCALHOST
-CUser	localhost
-SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser' order by 1,2;
-user	host	db	select_priv
-CUser	LOCALHOST	test	Y
-CUser	localhost	test	Y
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'LOCALHOST';
-flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-user	host
-CUser	LOCALHOST
-CUser	localhost
-SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser' order by 1,2;
-user	host	db	select_priv
-CUser	localhost	test	Y
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'localhost';
-flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-user	host
-CUser	LOCALHOST
-CUser	localhost
-SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser' order by 1,2;
-user	host	db	select_priv
-DROP USER CUser@localhost;
-DROP USER CUser@LOCALHOST;
-create table t1 (a int);
-grant select on test.t1 to CUser@localhost;
-grant select on test.t1 to CUser@LOCALHOST;
-flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-user	host
-CUser	LOCALHOST
-CUser	localhost
-SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
-user	host	db	Table_name	Table_priv	Column_priv
-CUser	LOCALHOST	test	t1	Select	
-CUser	localhost	test	t1	Select	
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'LOCALHOST';
-flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-user	host
-CUser	LOCALHOST
-CUser	localhost
-SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
-user	host	db	Table_name	Table_priv	Column_priv
-CUser	localhost	test	t1	Select	
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'localhost';
-flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-user	host
-CUser	LOCALHOST
-CUser	localhost
-SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
-user	host	db	Table_name	Table_priv	Column_priv
-DROP USER CUser@localhost;
-DROP USER CUser@LOCALHOST;
-grant select(a) on test.t1 to CUser@localhost;
-grant select(a) on test.t1 to CUser@LOCALHOST;
-flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-user	host
-CUser	LOCALHOST
-CUser	localhost
-SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
-user	host	db	Table_name	Table_priv	Column_priv
-CUser	LOCALHOST	test	t1		Select
-CUser	localhost	test	t1		Select
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'LOCALHOST';
-flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-user	host
-CUser	LOCALHOST
-CUser	localhost
-SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
-user	host	db	Table_name	Table_priv	Column_priv
-CUser	localhost	test	t1		Select
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'localhost';
-flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-user	host
-CUser	LOCALHOST
-CUser	localhost
-SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
-user	host	db	Table_name	Table_priv	Column_priv
-DROP USER CUser@localhost;
-DROP USER CUser@LOCALHOST;
-drop table t1;
-grant select on test.* to CUser2@localhost;
-grant select on test.* to CUser2@LOCALHOST;
-flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser2' order by 1,2;
-user	host
-CUser2	LOCALHOST
-CUser2	localhost
-SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 1,2;
-user	host	db	select_priv
-CUser2	LOCALHOST	test	Y
-CUser2	localhost	test	Y
-REVOKE SELECT ON test.* FROM 'CUser2'@'LOCALHOST';
-flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser2' order by 1,2;
-user	host
-CUser2	LOCALHOST
-CUser2	localhost
-SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 1,2;
-user	host	db	select_priv
-CUser2	localhost	test	Y
-REVOKE SELECT ON test.* FROM 'CUser2'@'localhost';
-flush privileges;
-SELECT user, host FROM mysql.user where user = 'CUser2' order by 1,2;
-user	host
-CUser2	LOCALHOST
-CUser2	localhost
-SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 1,2;
-user	host	db	select_priv
-DROP USER CUser2@localhost;
-DROP USER CUser2@LOCALHOST;
 CREATE DATABASE mysqltest_1;
 CREATE TABLE mysqltest_1.t1 (a INT);
 CREATE USER 'mysqltest1'@'%';

=== modified file 'mysql-test/t/grant3.test'
--- a/mysql-test/t/grant3.test	2009-10-20 06:17:57 +0000
+++ b/mysql-test/t/grant3.test	2010-10-14 14:37:17 +0000
@@ -41,107 +41,6 @@ delete from mysql.columns_priv where use
 flush privileges;
 
 #
-# Bug#19828 Case sensitivity in Grant/Revoke
-#
-
-grant select on test.* to CUser@localhost;
-grant select on test.* to CUser@LOCALHOST;
-flush privileges;
-
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser' order by 1,2;
-
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'LOCALHOST';
-flush privileges;
-
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser' order by 1,2;
-
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'localhost';
-flush privileges;
-
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser' order by 1,2;
-
-DROP USER CUser@localhost;
-DROP USER CUser@LOCALHOST;
-
-#### table grants
-create table t1 (a int);
-grant select on test.t1 to CUser@localhost;
-grant select on test.t1 to CUser@LOCALHOST;
-flush privileges;
-
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
-
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'LOCALHOST';
-flush privileges;
-
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
-
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'localhost';
-flush privileges;
-
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
-
-DROP USER CUser@localhost;
-DROP USER CUser@LOCALHOST;
-
-### column grants
-
-grant select(a) on test.t1 to CUser@localhost;
-grant select(a) on test.t1 to CUser@LOCALHOST;
-flush privileges;
-
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
-
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'LOCALHOST';
-flush privileges;
-
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
-
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'CUser'@'localhost';
-flush privileges;
-
-SELECT user, host FROM mysql.user where user = 'CUser' order by 1,2;
-SELECT user, host, db, Table_name, Table_priv, Column_priv FROM mysql.tables_priv where user = 'CUser' order by 1,2;
-
-DROP USER CUser@localhost;
-DROP USER CUser@LOCALHOST;
-
-drop table t1;
-
-# revoke on a specific DB only
-
-grant select on test.* to CUser2@localhost;
-grant select on test.* to CUser2@LOCALHOST;
-flush privileges;
-
-SELECT user, host FROM mysql.user where user = 'CUser2' order by 1,2;
-SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 1,2;
-
-REVOKE SELECT ON test.* FROM 'CUser2'@'LOCALHOST';
-flush privileges;
-
-SELECT user, host FROM mysql.user where user = 'CUser2' order by 1,2;
-SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 1,2;
-
-REVOKE SELECT ON test.* FROM 'CUser2'@'localhost';
-flush privileges;
-
-SELECT user, host FROM mysql.user where user = 'CUser2' order by 1,2;
-SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 1,2;
-
-DROP USER CUser2@localhost;
-DROP USER CUser2@LOCALHOST;
-
-
-#
 # Bug#31194 Privilege ordering does not order properly for wildcard values
 #
 


Attachment: [text/bzr-bundle] bzr/[e-mail]