summaryrefslogtreecommitdiff
path: root/mysql-test/t/merge.test
diff options
context:
space:
mode:
authorsvoj@april.(none) <>2006-09-29 00:23:43 +0500
committersvoj@april.(none) <>2006-09-29 00:23:43 +0500
commit7ed413d17b717fc91c5b23f81a482de3e1693929 (patch)
tree6ddce11f9510e4862cf11cfc2d279b535e208f76 /mysql-test/t/merge.test
parentf1b3b1628f34c04d00c32055ae5d42c80f115467 (diff)
parentad7da7f1de71afbd189d36c301d4ae077fc774ab (diff)
downloadmariadb-git-7ed413d17b717fc91c5b23f81a482de3e1693929.tar.gz
Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.1-engines
Diffstat (limited to 'mysql-test/t/merge.test')
-rw-r--r--mysql-test/t/merge.test11
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index d3a2928608d..4006fa27fe3 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -382,6 +382,17 @@ check table t1, t2;
drop table t1, t2, t3;
#
+# BUG#21617 - crash when selecting from merge table with inconsistent
+# indexes
+#
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES(2),(1);
+CREATE TABLE t2(a INT, KEY(a)) ENGINE=MERGE UNION=(t1);
+--error 1030
+SELECT * FROM t2 WHERE a=2;
+DROP TABLE t1, t2;
+
+#
# BUG#10974 - No error message if merge table based on union of innodb,
# memory
#