diff options
| author | unknown <istruewing@chilla.local> | 2007-03-06 10:34:14 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-03-06 10:34:14 +0100 |
| commit | 2f863451b5c5fe848d26f5f87ae27f13415805b3 (patch) | |
| tree | 38bd31c78f1f089fbbc3b41296274ec6a1cdb3ea /mysql-test/r/merge.result | |
| parent | af44be2d25e25189363044265089fab391e060d1 (diff) | |
| parent | da9c659c8196d1da63330fc7b1b6710217801a6f (diff) | |
| download | mariadb-git-2f863451b5c5fe848d26f5f87ae27f13415805b3.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-bug26464
into chilla.local:/home/mydev/mysql-5.0-bug26464
mysql-test/t/merge.test:
Auto merged
mysql-test/r/merge.result:
Bug#26464 - insert delayed + update + merge = corruption
Manual merge from 4.1
sql/ha_myisammrg.h:
Bug#26464 - insert delayed + update + merge = corruption
Manual merge from 4.1
Diffstat (limited to 'mysql-test/r/merge.result')
| -rw-r--r-- | mysql-test/r/merge.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 87ac5c12fda..c4e31da6cb3 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -803,6 +803,11 @@ CREATE TABLE tm1(a SMALLINT, b SMALLINT, KEY(a)) ENGINE=MERGE UNION=(t1); SELECT * FROM tm1; ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist DROP TABLE t1, tm1; +CREATE TABLE t1(c1 INT) ENGINE=MyISAM; +CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1); +INSERT DELAYED INTO t2 VALUES(1); +ERROR HY000: Table storage engine for 't2' doesn't have this option +DROP TABLE t1, t2; create table t1 (b bit(1)); create table t2 (b bit(1)); create table tm (b bit(1)) engine = merge union = (t1,t2); |