From: Dmitry Shulga Date: October 18 2010 3:39pm Subject: bzr commit into mysql-5.5-bugteam branch (Dmitry.Shulga:3248) Bug#36742 List-Archive: http://lists.mysql.com/commits/120992 X-Bug: 36742 Message-Id: <0LAH00D0OSTZEP90@fe-emea-10.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_F1Q9mhyxHG7zfwTGi91Y7A)" --Boundary_(ID_F1Q9mhyxHG7zfwTGi91Y7A) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline #At file:///Users/shulga/projects/mysql/mysql-5.5-bugteam/ based on revid:tor.didriksen@stripped 3248 Dmitry Shulga 2010-10-18 [merge] Auto-merge from mysql-5.1-bugteam for bug#36742. 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:03:53 +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:03:53 +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_F1Q9mhyxHG7zfwTGi91Y7A) 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/mysql-5.5-\ # bugteam/ # testament_sha1: 9e75c785da50eb38f99378b6934a11bfd0b504d9 # timestamp: 2010-10-18 22:39:32 +0700 # source_branch: file:///Users/shulga/projects/mysql/5.1-bugteam-\ # bug36742/ # base_revision_id: tor.didriksen@stripped\ # kpynpio8prphfyaa # # Begin bundle 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 8XckU4UJAB8a4MA= --Boundary_(ID_F1Q9mhyxHG7zfwTGi91Y7A)--