summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
diff options
context:
space:
mode:
authorTimothy Smith <timothy.smith@sun.com>2009-02-06 15:51:36 +0100
committerTimothy Smith <timothy.smith@sun.com>2009-02-06 15:51:36 +0100
commit914e81c38ee4c8248197d704a7bcf4919a88b833 (patch)
tree12204df9269ebabe352ab7fd0635bfe41c5c2a7f /mysql-test/r/merge.result
parent299aeb53b7562a2747ca3c36936bab8e77c26f08 (diff)
parent7fe7d9b2d29a55cea368f396fc7b358e8fc5dd77 (diff)
downloadmariadb-git-914e81c38ee4c8248197d704a7bcf4919a88b833.tar.gz
Auto merge from main 5.0
Diffstat (limited to 'mysql-test/r/merge.result')
-rw-r--r--mysql-test/r/merge.result11
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index f8ef4f23180..3f2ac3e08ec 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -940,4 +940,15 @@ m1 CREATE TABLE `m1` (
`a` int(11) default NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1, m1;
+CREATE TABLE t1(a INT);
+CREATE TABLE t2(a VARCHAR(10));
+CREATE TABLE m1(a INT) ENGINE=MERGE UNION=(t1, t2);
+CREATE TABLE m2(a INT) ENGINE=MERGE UNION=(t1);
+SELECT * FROM t1;
+a
+SELECT * FROM m1;
+ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
+SELECT * FROM m2;
+a
+DROP TABLE t1, t2, m1, m2;
End of 5.0 tests