diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-04 08:24:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-04 08:24:06 +0300 |
| commit | 2c1067166d7e8a9541578220b408f1e553e23916 (patch) | |
| tree | 2ba0932f92d88e01d51393de63dda842f6daf320 /mysql-test/t/merge.test | |
| parent | 2cf3e2ea2fca3d3613309de94d55c88dedb3831a (diff) | |
| parent | 61b2618d3aae78950f1b8dbe8d4482573c77875d (diff) | |
| download | mariadb-git-2c1067166d7e8a9541578220b408f1e553e23916.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 95c78caf034..99309e6a7f0 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -2732,38 +2732,6 @@ insert into m1 (a) values ((select max(a) from v1)); insert into m1 (a) values ((select max(a) from tmp, v1)); ---error ER_UPDATE_TABLE_USED -update m1 set a = ((select max(a) from m1)); ---error ER_UPDATE_TABLE_USED -update m1 set a = ((select max(a) from m2)); ---error ER_UPDATE_TABLE_USED -update m1 set a = ((select max(a) from t1)); ---error ER_UPDATE_TABLE_USED -update m1 set a = ((select max(a) from t2)); - ---error ER_UPDATE_TABLE_USED -update m1 set a = ((select max(a) from t3, m1)); ---error ER_UPDATE_TABLE_USED -update m1 set a = ((select max(a) from t3, m2)); ---error ER_UPDATE_TABLE_USED -update m1 set a = ((select max(a) from t3, t1)); ---error ER_UPDATE_TABLE_USED -update m1 set a = ((select max(a) from t3, t2)); - ---error ER_UPDATE_TABLE_USED -update m1 set a = ((select max(a) from tmp, m1)); ---error ER_UPDATE_TABLE_USED -update m1 set a = ((select max(a) from tmp, m2)); ---error ER_UPDATE_TABLE_USED -update m1 set a = ((select max(a) from tmp, t1)); ---error ER_UPDATE_TABLE_USED -update m1 set a = ((select max(a) from tmp, t2)); - ---error ER_VIEW_PREVENT_UPDATE -update m1 set a = ((select max(a) from v1)); ---error ER_VIEW_PREVENT_UPDATE -update m1 set a = ((select max(a) from tmp, v1)); - drop view v1; drop temporary table tmp; drop table t1, t2, t3, m1, m2; @@ -2948,4 +2916,3 @@ eval set global storage_engine=$default; # Check that all connections opened by test cases in this file are really # gone so execution of other tests won't be affected by their presence. --source include/wait_until_count_sessions.inc - |