From: Marc Alff Date: April 14 2010 10:33am Subject: bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3154) List-Archive: http://lists.mysql.com/commits/105624 Message-Id: <20100414103319.A76AD420924@MarcBook.local> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_6XqsePybB9nmm6aWgY33rA)" --Boundary_(ID_6XqsePybB9nmm6aWgY33rA) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline #At file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/ based on revid:marc.alff@stripped 3154 Marc Alff 2010-04-14 Test results cleanup modified: mysql-test/r/grant.result mysql-test/r/insert_notembedded.result mysql-test/r/mysqldump.result mysql-test/r/trigger_notembedded.result === modified file 'mysql-test/r/grant.result' --- a/mysql-test/r/grant.result 2010-02-23 18:43:26 +0000 +++ b/mysql-test/r/grant.result 2010-04-14 10:33:14 +0000 @@ -490,7 +490,7 @@ create database mysqltest; create table mysqltest.t1 (a int,b int,c int); grant all on mysqltest.t1 to mysqltest_1@localhost; alter table t1 rename t2; -ERROR 42000: INSERT,CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2' +ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2' revoke all privileges on mysqltest.t1 from mysqltest_1@localhost; delete from mysql.user where user=_binary'mysqltest_1'; drop database mysqltest; @@ -981,9 +981,9 @@ Grants for mysqltest_1@localhost GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' GRANT SELECT ON `mysqltest1`.`t1` TO 'mysqltest_1'@'localhost' RENAME TABLE t1 TO t2; -ERROR 42000: DROP,ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1' +ERROR 42000: DROP, ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1' ALTER TABLE t1 RENAME TO t2; -ERROR 42000: DROP,ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1' +ERROR 42000: DROP, ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1' GRANT DROP ON mysqltest1.t1 TO mysqltest_1@localhost; RENAME TABLE t1 TO t2; ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1' @@ -995,9 +995,9 @@ Grants for mysqltest_1@localhost GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' GRANT SELECT, DROP, ALTER ON `mysqltest1`.`t1` TO 'mysqltest_1'@'localhost' RENAME TABLE t1 TO t2; -ERROR 42000: INSERT,CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2' +ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2' ALTER TABLE t1 RENAME TO t2; -ERROR 42000: INSERT,CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2' +ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2' GRANT INSERT, CREATE ON mysqltest1.t1 TO mysqltest_1@localhost; SHOW GRANTS; Grants for mysqltest_1@localhost === modified file 'mysql-test/r/insert_notembedded.result' --- a/mysql-test/r/insert_notembedded.result 2009-11-20 19:51:12 +0000 +++ b/mysql-test/r/insert_notembedded.result 2010-04-14 10:33:14 +0000 @@ -32,7 +32,7 @@ INNER JOIN view_stations AS station ON table_source.id = stations.icao LEFT JOIN table_target AS old USING (mexs_id); -ERROR 42000: INSERT,DELETE command denied to user 'user20989'@'localhost' for table 'table_target' +ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table 'table_target' REPLACE INTO view_target2 SELECT stations.mexs_id AS mexs_id, datetime AS messzeit FROM table_source @@ -40,7 +40,7 @@ INNER JOIN view_stations AS station ON table_source.id = stations.icao LEFT JOIN view_target2 AS old USING (mexs_id); -ERROR 42000: INSERT,DELETE command denied to user 'user20989'@'localhost' for table 'view_target2' +ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table 'view_target2' REPLACE INTO view_target3 SELECT stations.mexs_id AS mexs_id, datetime AS messzeit FROM table_source @@ -60,7 +60,7 @@ ON table_source.id = statio LEFT JOIN table_target AS old USING (mexs_id); REPLACE INTO table_target2 VALUES ('00X45Y78','2006-07-12 07:50:00'); -ERROR 42000: INSERT,DELETE command denied to user 'user20989'@'localhost' for table 'table_target2' +ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table 'table_target2' REPLACE INTO view_target2 VALUES ('12X45Y78','2006-07-12 07:50:00'); SELECT stations.mexs_id AS mexs_id, datetime AS messzeit FROM table_source === modified file 'mysql-test/r/mysqldump.result' --- a/mysql-test/r/mysqldump.result 2010-02-20 10:07:32 +0000 +++ b/mysql-test/r/mysqldump.result 2010-04-14 10:33:14 +0000 @@ -3557,8 +3557,8 @@ reset master; mysqldump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227) mysqldump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227) grant RELOAD on *.* to mysqltest_1@localhost; -mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER,REPLICATION CLIENT privilege(s) for this operation (1227) -mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER,REPLICATION CLIENT privilege(s) for this operation (1227) +mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER, REPLICATION CLIENT privilege(s) for this operation (1227) +mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER, REPLICATION CLIENT privilege(s) for this operation (1227) grant REPLICATION CLIENT on *.* to mysqltest_1@localhost; drop table t1; drop user mysqltest_1@localhost; === modified file 'mysql-test/r/trigger_notembedded.result' --- a/mysql-test/r/trigger_notembedded.result 2010-01-15 11:42:15 +0000 +++ b/mysql-test/r/trigger_notembedded.result 2010-04-14 10:33:14 +0000 @@ -383,7 +383,7 @@ CALL p2(NEW.i1); INSERT INTO t1 VALUES (7); ERROR 42000: UPDATE command denied to user 'mysqltest_dfn'@'localhost' for column 'i1' in table 't1' INSERT INTO t2 VALUES (11); -ERROR 42000: SELECT,UPDATE command denied to user 'mysqltest_dfn'@'localhost' for column 'i1' in table 't2' +ERROR 42000: SELECT, UPDATE command denied to user 'mysqltest_dfn'@'localhost' for column 'i1' in table 't2' DROP TRIGGER t2_bi; DROP TRIGGER t1_bi; GRANT SELECT ON mysqltest_db1.* TO mysqltest_dfn@localhost; --Boundary_(ID_6XqsePybB9nmm6aWgY33rA) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/marc.alff@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/marc.alff@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/ # testament_sha1: b043f2a96af9b8d0c72fc197700bf20e891c1b29 # timestamp: 2010-04-14 04:33:19 -0600 # base_revision_id: marc.alff@stripped\ # 1hxrrbxa6374snwo # # Begin bundle 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 w1I7TuMZYCW0Mj/4u5IpwoSCnn0m8A== --Boundary_(ID_6XqsePybB9nmm6aWgY33rA)--