Return commented out tests.

mysql-test/r/view.result

@@ -2881,6 +2881,28 @@ Tables_in_test
 t1
 DROP TABLE t1;
 DROP VIEW IF EXISTS v1;
+CREATE DATABASE bug21261DB;
+USE bug21261DB;
+CREATE TABLE t1 (x INT);
+CREATE SQL SECURITY INVOKER VIEW v1 AS SELECT x FROM t1;
+GRANT INSERT, UPDATE ON v1 TO 'user21261'@'localhost';
+GRANT INSERT, UPDATE ON t1 TO 'user21261'@'localhost';
+CREATE TABLE t2 (y INT);
+GRANT SELECT ON t2 TO 'user21261'@'localhost';
+INSERT INTO v1 (x) VALUES (5);
+UPDATE v1 SET x=1;
+GRANT SELECT ON v1 TO 'user21261'@'localhost';
+GRANT SELECT ON t1 TO 'user21261'@'localhost';
+UPDATE v1,t2 SET x=1 WHERE x=y;
+SELECT * FROM t1;
+x
+1
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'user21261'@'localhost';
+DROP USER 'user21261'@'localhost';
+DROP VIEW v1;
+DROP TABLE t1;
+DROP DATABASE bug21261DB;
+USE test;
 create table t1 (f1 datetime);
 create view v1 as select * from t1 where f1 between now() and now() + interval 1 minute;
 show create view v1;

mysql-test/r/view_grant.result

@@ -172,29 +172,30 @@ a	b
 35	4
 46	5
 50	10
+update v1 set a=a+c;
 select * from t1;
 a	b
-13	2
-24	3
-35	4
-46	5
-50	10
+16	2
+28	3
+40	4
+52	5
+61	10
 update t2,v2 set v2.a=v2.a+v2.c where t2.x=v2.c;
 select * from t1;
 a	b
-13	2
-27	3
-39	4
-51	5
-50	10
+16	2
+31	3
+44	4
+57	5
+61	10
 update v2 set a=a+c;
 select * from t1;
 a	b
-15	2
-30	3
-43	4
-56	5
-60	10
+18	2
+34	3
+48	4
+62	5
+71	10
 update t2,v2 set v2.c=v2.a+v2.c where t2.x=v2.c;
 ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for column 'c' in table 'v2'
 update v2 set c=a+c;
@@ -575,12 +576,16 @@ UPDATE mysqltest1.v_ts SET x= 200 WHERE x = 100;
 ERROR 42000: UPDATE command denied to user 'readonly'@'localhost' for table 'v_ts'
 UPDATE mysqltest1.v_ts SET x= 200;
 ERROR 42000: UPDATE command denied to user 'readonly'@'localhost' for table 'v_ts'
+UPDATE mysqltest1.v_tu SET x= 200 WHERE x = 100;
+UPDATE mysqltest1.v_tus SET x= 200 WHERE x = 100;
+UPDATE mysqltest1.v_tu SET x= 200;
 DELETE FROM mysqltest1.v_ts WHERE x= 200;
 ERROR 42000: DELETE command denied to user 'readonly'@'localhost' for table 'v_ts'
 DELETE FROM mysqltest1.v_ts;
 ERROR 42000: DELETE command denied to user 'readonly'@'localhost' for table 'v_ts'
 DELETE FROM mysqltest1.v_td WHERE x= 200;
 ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for column 'x' in table 'v_td'
+DELETE FROM mysqltest1.v_tds WHERE x= 200;
 DELETE FROM mysqltest1.v_td;
 DROP VIEW mysqltest1.v_tds;
 DROP VIEW mysqltest1.v_td;

mysql-test/t/view.test

@@ -2783,42 +2783,39 @@ DROP VIEW IF EXISTS v1;
 # Bug#21261 Wrong access rights was required for an insert to a view
 #
 
-# !!! This test case fails in ps-protocol due to a bug in the code of mwl106
-# !!! Uncomment it when the bug is fixed
-
-# CREATE DATABASE bug21261DB;
-# USE bug21261DB;
-# connect (root,localhost,root,,bug21261DB);
-# connection root;
-#
-# CREATE TABLE t1 (x INT);
-# CREATE SQL SECURITY INVOKER VIEW v1 AS SELECT x FROM t1;
-# GRANT INSERT, UPDATE ON v1 TO 'user21261'@'localhost';
-# GRANT INSERT, UPDATE ON t1 TO 'user21261'@'localhost';
-# CREATE TABLE t2 (y INT);
-# GRANT SELECT ON t2 TO 'user21261'@'localhost';
-#
-# connect (user21261, localhost, user21261,, bug21261DB);
-# connection user21261;
-# INSERT INTO v1 (x) VALUES (5);
-# UPDATE v1 SET x=1;
-# connection root;
-# GRANT SELECT ON v1 TO 'user21261'@'localhost';
-# GRANT SELECT ON t1 TO 'user21261'@'localhost';
-# connection user21261;
-# UPDATE v1,t2 SET x=1 WHERE x=y;
-# connection root;
-# SELECT * FROM t1;
-# REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'user21261'@'localhost';
-# DROP USER 'user21261'@'localhost';
-# DROP VIEW v1;
-# DROP TABLE t1;
-# DROP DATABASE bug21261DB;
-# 
-# connection default;
-# USE test;
-# disconnect root;
-# disconnect user21261;
+CREATE DATABASE bug21261DB;
+USE bug21261DB;
+connect (root,localhost,root,,bug21261DB);
+connection root;
+
+CREATE TABLE t1 (x INT);
+CREATE SQL SECURITY INVOKER VIEW v1 AS SELECT x FROM t1;
+GRANT INSERT, UPDATE ON v1 TO 'user21261'@'localhost';
+GRANT INSERT, UPDATE ON t1 TO 'user21261'@'localhost';
+CREATE TABLE t2 (y INT);
+GRANT SELECT ON t2 TO 'user21261'@'localhost';
+
+connect (user21261, localhost, user21261,, bug21261DB);
+connection user21261;
+INSERT INTO v1 (x) VALUES (5);
+UPDATE v1 SET x=1;
+connection root;
+GRANT SELECT ON v1 TO 'user21261'@'localhost';
+GRANT SELECT ON t1 TO 'user21261'@'localhost';
+connection user21261;
+UPDATE v1,t2 SET x=1 WHERE x=y;
+connection root;
+SELECT * FROM t1;
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'user21261'@'localhost';
+DROP USER 'user21261'@'localhost';
+DROP VIEW v1;
+DROP TABLE t1;
+DROP DATABASE bug21261DB;
+
+connection default;
+USE test;
+disconnect root;
+disconnect user21261;
 
 
 #

mysql-test/t/view_grant.test

@@ -223,9 +223,7 @@ use mysqltest;
 # update with rights on VIEW column
 update t2,v1 set v1.a=v1.a+v1.c where t2.x=v1.c;
 select * from t1;
-# !!! This query fails in ps-protocol due to a bug in the code of mwl106
-# !!! Uncomment it when the bug is fixed 
-# update v1 set a=a+c;
+update v1 set a=a+c;
 select * from t1;
 # update with rights on whole VIEW
 update t2,v2 set v2.a=v2.a+v2.c where t2.x=v2.c;
@@ -763,11 +761,9 @@ INSERT INTO mysqltest1.v_ti VALUES (100);
 UPDATE mysqltest1.v_ts SET x= 200 WHERE x = 100;
 --error ER_TABLEACCESS_DENIED_ERROR
 UPDATE mysqltest1.v_ts SET x= 200;
-# !!! These queries fail in ps-protocol due to a bug in the code of mwl106
-# !!! Uncomment it when the bug is fixed 
-# UPDATE mysqltest1.v_tu SET x= 200 WHERE x = 100;
-# UPDATE mysqltest1.v_tus SET x= 200 WHERE x = 100;
-# UPDATE mysqltest1.v_tu SET x= 200;
+UPDATE mysqltest1.v_tu SET x= 200 WHERE x = 100;
+UPDATE mysqltest1.v_tus SET x= 200 WHERE x = 100;
+UPDATE mysqltest1.v_tu SET x= 200;
 
 --error ER_TABLEACCESS_DENIED_ERROR
 DELETE FROM mysqltest1.v_ts WHERE x= 200;
@@ -775,9 +771,7 @@ DELETE FROM mysqltest1.v_ts WHERE x= 200;
 DELETE FROM mysqltest1.v_ts;
 --error ER_COLUMNACCESS_DENIED_ERROR
 DELETE FROM mysqltest1.v_td WHERE x= 200;
-# !!! These queries fail in ps-protocol due to a bug in the code of mwl106
-# !!! Uncomment it when the bug is fixed 
-# DELETE FROM mysqltest1.v_tds WHERE x= 200;
+DELETE FROM mysqltest1.v_tds WHERE x= 200;
 DELETE FROM mysqltest1.v_td;
 
 connection default;