summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2002-11-20 15:17:17 +0100
committerunknown <serg@serg.mysql.com>2002-11-20 15:17:17 +0100
commitda6fc2821016a3e4dbba997af4b5a8fa4bb6fcb4 (patch)
tree021609d4dfdaa4e20d4556ce766de887214a6207
parentd8eda713379befa0f9b9048d3d2d58f7f4c59d2d (diff)
downloadmariadb-git-da6fc2821016a3e4dbba997af4b5a8fa4bb6fcb4.tar.gz
bug in _ftb_strstr fixed :)
-rw-r--r--myisam/ft_boolean_search.c6
-rw-r--r--mysql-test/r/fulltext.result3
-rw-r--r--mysql-test/t/fulltext.test1
3 files changed, 7 insertions, 3 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
index a8fa011edf6..97c55c1d937 100644
--- a/myisam/ft_boolean_search.c
+++ b/myisam/ft_boolean_search.c
@@ -348,9 +348,9 @@ static int _ftb_strstr(const byte *s0, const byte *e0,
if (s0 >= e0)
return 0;
p=s1+1;
- while (s0 < e0 && p < e1 && cs->to_upper[(uint) (uchar) *s0++] ==
- cs->to_upper[(uint) (uchar) *p++])
- /* no-op */;
+ while (s0 < e0 && p < e1 && cs->to_upper[(uint) (uchar) *s0] ==
+ cs->to_upper[(uint) (uchar) *p])
+ s0++, p++;
if (p >= e1)
return 1;
}
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index ab227687265..edf109fcc93 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -85,6 +85,9 @@ Full-text search in MySQL implements vector space model
select * from t1 where MATCH a,b AGAINST ('"text search" +"now support"' IN BOOLEAN MODE);
a b
MySQL has now support for full-text search
+select * from t1 where MATCH a,b AGAINST ('"text i"' IN BOOLEAN MODE);
+a b
+Full-text indexes are called collections
select * from t1 where MATCH a AGAINST ("search" IN BOOLEAN MODE);
a b
Full-text search in MySQL implements vector space model
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index 6483045f4ed..5a64f2614aa 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -40,6 +40,7 @@ select * from t1 where MATCH a,b AGAINST ('"Now sUPPort"' IN BOOLEAN MODE);
select * from t1 where MATCH a,b AGAINST ('"text search" "now support"' IN BOOLEAN MODE);
select * from t1 where MATCH a,b AGAINST ('"text search" -"now support"' IN BOOLEAN MODE);
select * from t1 where MATCH a,b AGAINST ('"text search" +"now support"' IN BOOLEAN MODE);
+select * from t1 where MATCH a,b AGAINST ('"text i"' IN BOOLEAN MODE);
# boolean w/o index: