diff options
| -rw-r--r-- | mysql-test/r/merge.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/union.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/union.test | 1 |
3 files changed, 6 insertions, 7 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 2f4f0071fa7..5755033190b 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -647,7 +647,7 @@ create table t2 (a int); insert into t1 values (0); insert into t2 values (1); create table t3 engine=merge union=(t1, t2) select * from t1; -INSERT TABLE 't1' isn't allowed in FROM table list +ERROR HY000: You can't specify target table 't1' for update in FROM clause create table t3 engine=merge union=(t1, t2) select * from t2; -INSERT TABLE 't2' isn't allowed in FROM table list +ERROR HY000: You can't specify target table 't2' for update in FROM clause drop table t1, t2; diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 2062d332f5d..2f42bedf67a 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -431,7 +431,6 @@ create table t1 select a from t1 union select a from t2; ERROR HY000: You can't specify target table 't1' for update in FROM clause select a from t1 union select a from t2 order by t2.a; ERROR 42S02: Unknown table 't2' in order clause -drop table t1; drop table t1,t2; select length(version()) > 1 as `*` UNION select 2; * @@ -440,9 +439,10 @@ select length(version()) > 1 as `*` UNION select 2; create table t1 (a int); insert into t1 values (0), (3), (1), (2); explain (select * from t1) union (select * from t1) order by a; -table type possible_keys key key_len ref rows Extra -t1 ALL NULL NULL NULL NULL 4 -t1 ALL NULL NULL NULL NULL 4 +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 4 +2 UNION t1 ALL NULL NULL NULL NULL 4 +NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL Using filesort drop table t1; CREATE TABLE t1 ( id int(3) unsigned default '0') ENGINE=MyISAM; INSERT INTO t1 (id) VALUES("1"); diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index 9248305a750..263f631a65f 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -256,7 +256,6 @@ drop temporary table t1; create table t1 select a from t1 union select a from t2; --error 1109 select a from t1 union select a from t2 order by t2.a; -drop table t1; # Drop temporary table drop table t1,t2; # |