From: Dmitry Shulga Date: October 18 2010 2:02pm Subject: bzr commit into mysql-5.1-bugteam branch (Dmitry.Shulga:3530) Bug#19828 Bug#36742 List-Archive: http://lists.mysql.com/commits/120978 X-Bug: 19828,36742 Message-Id: <0LAH00DP1OCBEP70@fe-emea-10.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_v4mpvEQTmclWKvxYAAwhCw)" --Boundary_(ID_v4mpvEQTmclWKvxYAAwhCw) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline #At file:///Users/shulga/projects/mysql/5.1-bugteam-bug36742/ based on revid:luis.soares@stripped 3530 Dmitry Shulga 2010-10-18 Follow up for bug#36742. Changed test case for bug#19828 because 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-18 14:02:22 +0000 @@ -21,123 +21,108 @@ grant select on test.* to CUser@LOCALHOS 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; +ERROR HY000: Operation DROP USER failed for '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; +ERROR HY000: Operation DROP USER failed for '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; +ERROR HY000: Operation DROP USER failed for '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'; +ERROR 42000: There is no such grant defined for user 'CUser2' on host '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; +ERROR HY000: Operation DROP USER failed for '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-18 14:02:22 +0000 @@ -64,6 +64,7 @@ SELECT user, host FROM mysql.user where SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser' order by 1,2; DROP USER CUser@localhost; +--error ER_CANNOT_USER DROP USER CUser@LOCALHOST; #### table grants @@ -88,6 +89,7 @@ SELECT user, host FROM mysql.user where 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; +--error ER_CANNOT_USER DROP USER CUser@LOCALHOST; ### column grants @@ -112,6 +114,7 @@ SELECT user, host FROM mysql.user where 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; +--error ER_CANNOT_USER DROP USER CUser@LOCALHOST; drop table t1; @@ -131,6 +134,7 @@ 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; +--error ER_NONEXISTING_GRANT REVOKE SELECT ON test.* FROM 'CUser2'@'localhost'; flush privileges; @@ -138,6 +142,7 @@ SELECT user, host FROM mysql.user where SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 1,2; DROP USER CUser2@localhost; +--error ER_CANNOT_USER DROP USER CUser2@LOCALHOST; --Boundary_(ID_v4mpvEQTmclWKvxYAAwhCw) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/dmitry.shulga@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/dmitry.shulga@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@stripped # target_branch: file:///Users/shulga/projects/mysql/5.1-bugteam-\ # bug36742/ # testament_sha1: 4c6fa08d14d242a730da09b9d98b7281f3e6b0e3 # timestamp: 2010-10-18 21:02:31 +0700 # base_revision_id: luis.soares@stripped\ # 47wf2yswi8k5g3y4 # # Begin bundle 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 m8VC --Boundary_(ID_v4mpvEQTmclWKvxYAAwhCw)--