From: Dmitry Shulga Date: October 14 2010 2:37pm Subject: bzr commit into mysql-5.1-bugteam branch (Dmitry.Shulga:3530) Bug#19828 Bug#36742 List-Archive: http://lists.mysql.com/commits/120779 X-Bug: 19828,36742 Message-Id: <0LAA009FKBAUHX60@fe-emea-10.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_EIBfxBYqaBucXs+MeI/wCw)" --Boundary_(ID_EIBfxBYqaBucXs+MeI/wCw) 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-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 # --Boundary_(ID_EIBfxBYqaBucXs+MeI/wCw) 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: d4c01a5debfd99ab105eb52c56dbbb9f8b254f4d # timestamp: 2010-10-14 21:37:26 +0700 # base_revision_id: luis.soares@stripped\ # 47wf2yswi8k5g3y4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRFIuRgAAhDfgAAQWGP/918C mAC////wUAS6vDLQs3WIHQQlEQJ6QyAxGpsmjJqDCD0jQGkiMnijyRo9QDaE0ZAGhowCShNTxRPE ZqJk8kbSHqAGhoAMBoAABoAAAAAAkkIGgAmmiZpMieSntTKeoxDZSo1Lho451PQEKWukDLGiirGt i2MKTEgMBgz18l8PQC41ChZ2jW5b5/3uO6ZOiYfMJ2O0GkhcxBj7A8T5qLqzXbOA7NiDmCPY3a5B 8oUliDb3j9gaWzOMQNNtvKuSiXiOMEwDZKAGxOWBJCQiXyINWHVJ0EGDJEEkMxAGCpisHjD6VdCB ZGdlOvA3BK94FS3Qcta+EEj0ZIoKAsP8G52BjvrUksY6zUtjBfcrypYIAQyAhJ0qnK8AMgmMp14Z na0gMOoHDZVykkzAuA2Er7AVTzCIUjVEHW7QgCUmmJJKdjkxmIz6INTENsPfRE/+EhaVJAZ+IkKW lCobhMw84UPnAurNZsmyApo3Ehi9RmQmZ5OOQOdqKKLLluHElQpmcnvoZWMrUN+x6iF5tw25JETf gXrG26rYTkhiZmF5g75idE5/pwOEz6aCtYm4ZNph4y0kcsxY5cyodLE6mpiSk4FM2O14F461VWzD 5yBe4dPLcE9huPouOpIqrqrhipXlnyBCVh8CyghbAwHlfZTlUhtLCXGgqMppqCSmykeVnEr6GpaM SJaMi5LWvpc6upkAg1UNBkHjXqKHRZd4K+4l3GljRgWdTvqqSIYA6JVRVXC674fZ94ZiDCPORIi5 PdiHPmWUvhQKLul4Dtw5AvrS/okFZmkrsLSCFC+HWmuCXKpL1XY+FEsf69nmgFxvO8j2PUyDNusB 3M9jVo4DaDg5FmYTRIPIUxITs35e3hYbGsxi0ECzuJQSApxjjnGkLiQHRIIjRkRKML5+Sd9z2TF9 XP3MDp5vTVLm1HU2ZWq/RK8ciM03l6syGJC1+aav+aVEldMq01MA1Wj2ZV5YMPEgSIoWT6HW7qYU rphEVoF41Bu+YKo02m8pmHyke48LElTscjkON85veDEZC42F4rd16CJPBkctAOGTDMUaGot5ZbR8 kgGxanSdWmVf0hpei4CcVrNFP74XvtRisEdEjACBp7v8jac1qeI2aNfgpzIicira8OhUmC8R443P n0csB+xbrGY9p0KO0DinKas+S8DdPhNMvW0Y1Iqa9IZdhr8SMqINNTATCewMuWOgER5osae59bxK KOMpSfhXicu7l8Y56cAOJo/AWwx3sMEF1I1zyMt4FVWYiU3GUuwvTgL8gnOetTEuCrwtUDLFVtss fJcSuGQNxPBaH9kyl2/ui0qlvraGjK0wAsQ486w6SLufhmbibywDOpG3YQXiIhMr8uTJi/ul2kcS e4MNyysxURwNPdysHU0pMvs2giVwO8CclMjA057QsXkI8517MIwankXuvMMFT14IgB6WjsSB5D3r cWKB9iPltKSKGLCRkjNRNhuA1KipXlBqTgpEh9M+o/xdyRThQkBFIuRg --Boundary_(ID_EIBfxBYqaBucXs+MeI/wCw)--