diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2006-09-28 22:14:31 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2006-09-28 22:14:31 +0500 |
| commit | a93e28715950421aa46bb9368c338bde27aeda75 (patch) | |
| tree | 3e256610af9a7c207c8d7350ed947a8cca5670fe /mysql-test/t/merge.test | |
| parent | 7ddf1f5f5d1ca4e5d7de3769e28380de5bb85b00 (diff) | |
| parent | 1c6bca023414132be7be5ba5b29f4b3759b27502 (diff) | |
| download | mariadb-git-a93e28715950421aa46bb9368c338bde27aeda75.tar.gz | |
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
myisammrg/myrg_open.c:
Auto merged
mysql-test/r/merge.result:
Manual merge.
mysql-test/t/merge.test:
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 93eda3aad82..bb03b7b8d62 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -377,6 +377,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 # |