Commit b1eb4521 authored by unknown's avatar unknown
Browse files

Fix test results

parent 02453262

mysql-test/r/grant.result

+8 −8
Original line number Diff line number Diff line
@@ -359,13 +359,13 @@ GRANT SELECT (c) ON `mysqltest_2`.`t1` TO 'mysqltest_3'@'localhost' 
GRANT UPDATE (a) ON `mysqltest_1`.`t1` TO 'mysqltest_3'@'localhost'

GRANT UPDATE (d) ON `mysqltest_2`.`t2` TO 'mysqltest_3'@'localhost'

update mysqltest_1.t1, mysqltest_1.t2 set q=10 where b=1;

ERROR 42000: UPDATE command denied to user 'mysqltest_3@localhost' for column 'q' in table 't1'

ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for column 'q' in table 't1'

update mysqltest_1.t1, mysqltest_2.t2 set d=20 where d=1;

ERROR 42000: SELECT command denied to user 'mysqltest_3@localhost' for column 'd' in table 't1'

ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'd' in table 't2'

update mysqltest_2.t1, mysqltest_1.t2 set c=20 where b=1;

ERROR 42000: UPDATE command denied to user 'mysqltest_3@localhost' for column 'c' in table 't1'

ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for column 'c' in table 't1'

update mysqltest_2.t1, mysqltest_2.t2 set d=10 where s=2;

ERROR 42000: SELECT command denied to user 'mysqltest_3@localhost' for column 's' in table 't1'

ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 's' in table 't1'

update mysqltest_1.t1, mysqltest_2.t2 set a=10,d=10;

update mysqltest_1.t1, mysqltest_2.t1 set a=20 where c=20;

select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;
@@ -384,14 +384,14 @@ flush privileges; 
use mysqltest_1;

update mysqltest_2.t1, mysqltest_2.t2 set c=500,d=600;

update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;

ERROR 42000: UPDATE command denied to user 'mysqltest_3@localhost' for column 'a' in table 't1'

ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for column 'a' in table 't1'

use mysqltest_2;

update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;

ERROR 42000: Access denied for user 'mysqltest_3@localhost' to database 'mysqltest_1'

ERROR 42000: Access denied for user 'mysqltest_3'@'localhost' to database 'mysqltest_1'

update mysqltest_2.t1, mysqltest_1.t2 set c=100,b=200;

ERROR 42000: Access denied for user 'mysqltest_3@localhost' to database 'mysqltest_1'

ERROR 42000: Access denied for user 'mysqltest_3'@'localhost' to database 'mysqltest_1'

update mysqltest_1.t1, mysqltest_2.t2 set a=100,d=200;

ERROR 42000: Access denied for user 'mysqltest_3@localhost' to database 'mysqltest_1'

ERROR 42000: Access denied for user 'mysqltest_3'@'localhost' to database 'mysqltest_1'

select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;

a	q	b	r

10	2	1	2