summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2001-05-16 23:06:30 +0200
committerunknown <serg@serg.mysql.com>2001-05-16 23:06:30 +0200
commit89ec1da4fb9cb5d61f4c78e36092548a28c5dbac (patch)
tree2a70f22e99c521af3c0c2174fd0bbf8ed02fa073 /mysql-test/r/merge.result
parentb59b5f4b6ec6bd5b0eb8cee832b6d4f51fa646fc (diff)
downloadmariadb-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/r/merge.result')
-rw-r--r--mysql-test/r/merge.result3
1 files changed, 3 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