diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2006-09-29 00:00:27 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2006-09-29 00:00:27 +0500 |
| commit | 1eb1bf1f0b7fc2ec87d7097c164cc389972d58e5 (patch) | |
| tree | cb0da6feddaf396d3f2c2ed866624773c0d25da6 /mysql-test/t/merge.test | |
| parent | 251b488f49d024edb43e405ee2203fb40f8c9e1d (diff) | |
| parent | a93e28715950421aa46bb9368c338bde27aeda75 (diff) | |
| download | mariadb-git-1eb1bf1f0b7fc2ec87d7097c164cc389972d58e5.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
myisammrg/myrg_open.c:
Auto merged
myisammrg/myrg_queue.c:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/r/merge.result:
Manual merge.
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 185828c09a5..1308b0b83a4 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -379,6 +379,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 # |