From: Dmitry Shulga Date: October 18 2010 2:04pm Subject: bzr push into mysql-5.1-bugteam branch (Dmitry.Shulga:3531 to 3532) Bug#19828 Bug#36742 List-Archive: http://lists.mysql.com/commits/120980 X-Bug: 19828,36742 Message-Id: <0LAH00DR5OGAEP70@fe-emea-10.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_QbvFQr/pPH6LbC7YW4P+ig)" --Boundary_(ID_QbvFQr/pPH6LbC7YW4P+ig) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline 3532 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 3531 Tor Didriksen 2010-10-18 Bug#52172 test binlog.binlog_index needs --skip-core-file to avoid leaving core files For crash testing: kill the server without generating core file. include/my_dbug.h Use kill(getpid(), SIGKILL) which cannot be caught by signal handlers. All DBUG_XXX macros should be no-ops in optimized mode, do that for DBUG_ABORT as well. sql/handler.cc Kill server without generating core. sql/log.cc Kill server without generating core. modified: dbug/dbug.c include/my_dbug.h sql/handler.cc sql/log.cc === 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_QbvFQr/pPH6LbC7YW4P+ig) 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: bfab12480d5e844bc31868987ca0c01573579698 # timestamp: 2010-10-18 21:04:55 +0700 # base_revision_id: tor.didriksen@stripped\ # hl14gw6k15teb20r # # Begin bundle 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 T/hdyRThQkK1B2zw --Boundary_(ID_QbvFQr/pPH6LbC7YW4P+ig)--