summaryrefslogtreecommitdiff
path: root/mysql-test/t/merge.test
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-07-12 12:00:11 +0400
committerAlexander Barkov <bar@mariadb.org>2017-07-12 12:00:11 +0400
commite33bda183e80ff63a984ed2a938467950b23a3fd (patch)
tree940df9237ea3827324e93825db466e902854c0df /mysql-test/t/merge.test
parent51a552ddf21ed698f285e562d053b6e3a1e07726 (diff)
parent7c3df72d0a627aa6c12af14d57b2664af7f8b380 (diff)
downloadmariadb-git-e33bda183e80ff63a984ed2a938467950b23a3fd.tar.gz
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'mysql-test/t/merge.test')
-rw-r--r--mysql-test/t/merge.test33
1 files changed, 0 insertions, 33 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index 09f313616f1..95c78caf034 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -2764,39 +2764,6 @@ update m1 set a = ((select max(a) from v1));
--error ER_VIEW_PREVENT_UPDATE
update m1 set a = ((select max(a) from tmp, v1));
-
---error ER_UPDATE_TABLE_USED
-delete from m1 where a = (select max(a) from m1);
---error ER_UPDATE_TABLE_USED
-delete from m1 where a = (select max(a) from m2);
---error ER_UPDATE_TABLE_USED
-delete from m1 where a = (select max(a) from t1);
---error ER_UPDATE_TABLE_USED
-delete from m1 where a = (select max(a) from t2);
-
---error ER_UPDATE_TABLE_USED
-delete from m1 where a = (select max(a) from t3, m1);
---error ER_UPDATE_TABLE_USED
-delete from m1 where a = (select max(a) from t3, m2);
---error ER_UPDATE_TABLE_USED
-delete from m1 where a = (select max(a) from t3, t1);
---error ER_UPDATE_TABLE_USED
-delete from m1 where a = (select max(a) from t3, t2);
-
---error ER_UPDATE_TABLE_USED
-delete from m1 where a = (select max(a) from tmp, m1);
---error ER_UPDATE_TABLE_USED
-delete from m1 where a = (select max(a) from tmp, m2);
---error ER_UPDATE_TABLE_USED
-delete from m1 where a = (select max(a) from tmp, t1);
---error ER_UPDATE_TABLE_USED
-delete from m1 where a = (select max(a) from tmp, t2);
-
---error ER_VIEW_PREVENT_UPDATE
-delete from m1 where a = (select max(a) from v1);
---error ER_VIEW_PREVENT_UPDATE
-delete from m1 where a = (select max(a) from tmp, v1);
-
drop view v1;
drop temporary table tmp;
drop table t1, t2, t3, m1, m2;