summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorram@gw.mysql.r18.ru <>2004-09-02 16:25:32 +0500
committerram@gw.mysql.r18.ru <>2004-09-02 16:25:32 +0500
commitc6b2b2f09d8cbf78e24fd1e1bd9471b02986c14e (patch)
tree7a5317dd2ea2f292ff0b8ced2ad8590e3615c7ac /mysql-test/r
parentfc118875961eb6b656b4ed95a205f1e8eccbdc4c (diff)
parent3acccb988a7fba5f075acf7615bc0ec7f8548366 (diff)
downloadmariadb-git-c6b2b2f09d8cbf78e24fd1e1bd9471b02986c14e.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5232
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/merge.result9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 7b2b9a47b0f..3585b8b0018 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -610,3 +610,12 @@ x y
1 3
1 2
drop table t1,t2,t3;
+create table t1 (a int);
+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
+create table t3 engine=merge union=(t1, t2) select * from t2;
+INSERT TABLE 't2' isn't allowed in FROM table list
+drop table t1, t2;