diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2006-09-27 15:42:00 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2006-09-27 15:42:00 +0500 |
| commit | c5c4fa3c164c5754f4fe24048271c5813ace8ca3 (patch) | |
| tree | a8dc7e7fb0a9a18ff444881790c98ae17c44202a /mysql-test/t/merge.test | |
| parent | 96d1a25d4612e55f598f739b11d662bcd0a406a4 (diff) | |
| parent | 0e233516f3b9faa4625901858a808bb96510d672 (diff) | |
| download | mariadb-git-c5c4fa3c164c5754f4fe24048271c5813ace8ca3.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
myisammrg/myrg_open.c:
Auto merged
mysql-test/t/merge.test:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
Auto merged
mysql-test/r/repair.result:
Use local.
sql/table.cc:
Use local.
mysql-test/r/merge.result:
Manual merge
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 93fbc631680..185828c09a5 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -378,6 +378,20 @@ select * from t3; check table t1, t2; drop table t1, t2, t3; +# +# BUG#10974 - No error message if merge table based on union of innodb, +# memory +# +CREATE TABLE t1(a INT) ENGINE=MEMORY; +CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t1); +--error 1168 +SELECT * FROM t2; +DROP TABLE t1, t2; +CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t3); +--error 1168 +SELECT * FROM t2; +DROP TABLE t2; + # End of 4.1 tests # |