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 | d96989ca654fccc92a4620deca5f709fd84ec3f8 (patch) | |
| tree | 3e256610af9a7c207c8d7350ed947a8cca5670fe /mysql-test/r/merge.result | |
| parent | 1f9b959166f835165ef1c2d2bb499389a1a793fc (diff) | |
| parent | 7d915f01934d73cf2500618fc7f5148768cfd1b8 (diff) | |
| download | mariadb-git-d96989ca654fccc92a4620deca5f709fd84ec3f8.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/r/merge.result')
| -rw-r--r-- | mysql-test/r/merge.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 2d0ca55c74a..ff4828144a7 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -766,6 +766,12 @@ Table Op Msg_type Msg_text test.t1 check status OK test.t2 check status OK drop table t1, t2, t3; +CREATE TABLE t1(a INT); +INSERT INTO t1 VALUES(2),(1); +CREATE TABLE t2(a INT, KEY(a)) ENGINE=MERGE UNION=(t1); +SELECT * FROM t2 WHERE a=2; +ERROR HY000: Got error 124 from storage engine +DROP TABLE t1, t2; CREATE TABLE t1(a INT) ENGINE=MEMORY; CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t1); SELECT * FROM t2; |