diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-09 11:45:14 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-09 11:45:14 +0500 |
| commit | d2667d1a6ebe7feeb8b80fcc5cfefac80ed729b0 (patch) | |
| tree | 3b60d9c94a9cb3e81e8c9ff68a567dfe598f301a /mysql-test/r | |
| parent | 1f8dbdaf3a2bd06a87ed9fba93acb742c86fa83b (diff) | |
| parent | 6d9a796944c865afd9aab40711e1b134cb2245bc (diff) | |
| download | mariadb-git-d2667d1a6ebe7feeb8b80fcc5cfefac80ed729b0.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/archive.result | 9 | ||||
| -rw-r--r-- | mysql-test/r/fulltext_left_join.result | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index f73a80dde65..d89cecedcdd 100644 --- a/mysql-test/r/archive.result +++ b/mysql-test/r/archive.result @@ -12355,3 +12355,12 @@ auto fld1 companynr fld3 fld4 fld5 4 011403 37 intercepted audiology tinily 4 011403 37 intercepted audiology tinily drop table t1, t2, t4; +create table t1 (i int) engine=archive; +insert into t1 values (1); +repair table t1 use_frm; +Table Op Msg_type Msg_text +test.t1 repair status OK +select * from t1; +i +1 +drop table t1; diff --git a/mysql-test/r/fulltext_left_join.result b/mysql-test/r/fulltext_left_join.result index fdf11c14cc4..ea4cacf2fab 100644 --- a/mysql-test/r/fulltext_left_join.result +++ b/mysql-test/r/fulltext_left_join.result @@ -90,3 +90,10 @@ id link name relevance 1 1 string 0 2 0 string 0 DROP TABLE t1,t2; +CREATE TABLE t1 (a INT); +CREATE TABLE t2 (b INT, c TEXT, KEY(b)); +INSERT INTO t1 VALUES(1); +INSERT INTO t2(b,c) VALUES(2,'castle'),(3,'castle'); +SELECT * FROM t1 LEFT JOIN t2 ON a=b WHERE MATCH(c) AGAINST('+castle' IN BOOLEAN MODE); +a b c +DROP TABLE t1, t2; |