diff options
| author | unknown <serg@serg.mysql.com> | 2001-05-16 23:06:30 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-05-16 23:06:30 +0200 |
| commit | 89ec1da4fb9cb5d61f4c78e36092548a28c5dbac (patch) | |
| tree | 2a70f22e99c521af3c0c2174fd0bbf8ed02fa073 /mysql-test | |
| parent | b59b5f4b6ec6bd5b0eb8cee832b6d4f51fa646fc (diff) | |
| download | mariadb-git-89ec1da4fb9cb5d61f4c78e36092548a28c5dbac.tar.gz | |
Fulltext manual changed, MERGE bug fixed
Docs/manual.texi:
Fulltext manual changed, MERGE bug added to changelog
myisammrg/mymrgdef.h:
MERGE bug fixed
myisammrg/myrg_rkey.c:
MERGE bug fixed
myisammrg/myrg_rnext.c:
MERGE bug fixed
myisammrg/myrg_rprev.c:
MERGE bug fixed
mysql-test/r/merge.result:
MERGE bug fixed
mysql-test/t/merge.test:
MERGE bug fixed
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/merge.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/merge.test | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 9e8e1b81687..653e25af799 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -127,3 +127,6 @@ t3 CREATE TABLE `t3` ( `othr` int(11) NOT NULL default '0' ) TYPE=MRG_MyISAM UNION=(t1,t2) a +a b +1 1 +1 2 diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 0b14ba388ce..619ec1d58af 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -96,3 +96,16 @@ drop table t3,t2,t1; create table t1 (a int not null) type=merge; select * from t1; drop table t1; + +# +# Bug found by Monty. +# + +drop table if exists t3, t2, t1; +create table t1 (a int not null, b int not null, key(a,b)); +create table t2 (a int not null, b int not null, key(a,b)); +create table t3 (a int not null, b int not null, key(a,b)) TYPE=MERGE UNION=(t1,t2); +insert into t1 values (1,2),(2,1),(0,0),(4,4),(5,5),(6,6); +insert into t2 values (1,1),(2,2),(0,0),(4,4),(5,5),(6,6); +flush tables; +select * from t3 where a=1 order by b limit 2; |