diff options
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/multi_update.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/view.test | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index 8a213ab791c..1e1490cd3f1 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -159,8 +159,6 @@ LOCK TABLES t1 write, t2 read; DELETE t1.*, t2.* FROM t1,t2 where t1.n=t2.n; --error 1099 UPDATE t1,t2 SET t1.d=t2.d,t2.d=30 WHERE t1.n=t2.n; ---QQ This should not generate an error ---error 1099 UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n; unlock tables; LOCK TABLES t1 write, t2 write; @@ -428,7 +426,7 @@ drop table t1, t2, t3; # create table t1 (col1 int); create table t2 (col1 int); --- QQ The following should give error 1093 +-- error 1093 update t1,t2 set t1.col1 = (select max(col1) from t1) where t1.col1 = t2.col1; -- error 1093 delete t1 from t1,t2 where t1.col1 < (select max(col1) from t1) and t1.col1 = t2.col1; diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index 17077d1d086..8e38b5616f8 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -1300,13 +1300,9 @@ update v1,t1 set v1.s1='c' where t1.s1=v1.s1; select * from v1; prepare stmt1 from "update v1,t1 set v1.s1=? where t1.s1=v1.s1"; set @arg='d'; --- QQ This should not generate an error ---error 1036 execute stmt1 using @arg; select * from v1; set @arg='e'; --- QQ This should not generate an error ---error 1036 execute stmt1 using @arg; select * from v1; deallocate prepare stmt1; |