diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-08 01:33:46 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-08 01:33:46 +0200 |
| commit | 356003a8c9d939dc5c95f50539d3916e404d25a9 (patch) | |
| tree | 367be6b2c2ba604384d0c105144c39d4fff5754b | |
| parent | 901827f4257253a0da66252862e385171662bc60 (diff) | |
| parent | 680646c2aebec94482413d39062fbdfe96c6bda6 (diff) | |
| download | mariadb-git-356003a8c9d939dc5c95f50539d3916e404d25a9.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
myisam/ft_boolean_search.c:
Auto merged
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 2 | ||||
| -rw-r--r-- | myisam/ft_boolean_search.c | 5 | ||||
| -rw-r--r-- | mysql-test/r/fulltext.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/fulltext.test | 1 |
4 files changed, 11 insertions, 4 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index 64cb60936d4..275c278f29d 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -61,7 +61,7 @@ EOF # docs-commit@ mail #-- bk changes -v -r+ | grep -q Docs/manual.texi - if [ $? == 0 ] + if [ $? -eq 0 ] then echo "Notifying docs list at $DOCS" ( diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index d349df9fa85..de9d16e42c8 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -252,7 +252,7 @@ void _ftb_climb_the_tree(FTB_WORD *ftbw, my_off_t curdoc) { /* NOTE: special sort function of queue assures that all yn<0 * events for every particular subexpression will - * "auto-magically" happen BEFORE all yn>=0 events. So no + * "auto-magically" happen BEFORE all the yn>=0 events. So no * already matched expression can become not-matched again. */ ++ftbe->nos; @@ -261,15 +261,14 @@ void _ftb_climb_the_tree(FTB_WORD *ftbw, my_off_t curdoc) else /* if (yn==0) */ { + ftbe->cur_weight+=weight; if (ftbe->yesses >= ftbe->ythresh && !ftbe->nos) { yn=ftbe->yesno; - ftbe->cur_weight=weight; weight*=ftbe->weight; } else { - ftbe->cur_weight+=weight; break; } } diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result index c2b4de5f439..dbc0ac09f31 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -48,6 +48,13 @@ Full-text search in MySQL implements vector space model select * from t1 where MATCH(a,b) AGAINST("+search -(support vector)" IN BOOLEAN MODE); a b Function MATCH ... AGAINST() is used to do a search +select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t1; +a b x +MySQL has now support for full-text search 1 +Full-text indexes are called collections 1 +Only MyISAM tables support collections 2 +Function MATCH ... AGAINST() is used to do a search 0 +Full-text search in MySQL implements vector space model 0 delete from t1 where a like "MySQL%"; drop table t1; CREATE TABLE t1 ( diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test index af58c747167..2608a9c02a6 100644 --- a/mysql-test/t/fulltext.test +++ b/mysql-test/t/fulltext.test @@ -21,6 +21,7 @@ select * from t1 where MATCH(a,b) AGAINST("+support +collections" IN BOOLEAN MOD select * from t1 where MATCH(a,b) AGAINST("+search" IN BOOLEAN MODE); select * from t1 where MATCH(a,b) AGAINST("+search +(support vector)" IN BOOLEAN MODE); select * from t1 where MATCH(a,b) AGAINST("+search -(support vector)" IN BOOLEAN MODE); +select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t1; delete from t1 where a like "MySQL%"; drop table t1; |