diff options
| author | unknown <svoj@april.(none)> | 2006-09-29 00:23:43 +0500 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-09-29 00:23:43 +0500 |
| commit | 70c6f7d2276d34b5890f074a22b6a9f3a7c9579d (patch) | |
| tree | 6ddce11f9510e4862cf11cfc2d279b535e208f76 /mysql-test/t/merge.test | |
| parent | 0d7fdc9ee306a2aadfa9b676ce421ead182f90dd (diff) | |
| parent | 59a7f1ab5fe51755413eb75335a8bfd82975acb1 (diff) | |
| download | mariadb-git-70c6f7d2276d34b5890f074a22b6a9f3a7c9579d.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
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysys/queues.c:
Auto merged
storage/myisammrg/myrg_open.c:
Auto merged
storage/myisammrg/myrg_queue.c:
Auto merged
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 11 |
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 # |