Merge work:/home/bk/mysql-4.0

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

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;
   }

myisammrg/myrg_range.c

@@ -30,8 +30,10 @@ ha_rows myrg_records_in_range(MYRG_INFO *info, int inx, const byte *start_key,
     res=mi_records_in_range(table->table, inx,
                 start_key, start_key_len, start_search_flag,
                   end_key,   end_key_len,   end_search_flag);
-    if (res == HA_POS_ERROR || records > HA_POS_ERROR - res)
-      return res;
+    if (res == HA_POS_ERROR)
+      return HA_POS_ERROR; 
+    if (records > HA_POS_ERROR - res)
+      return HA_POS_ERROR-1;
     records+=res;
   }
   return records;

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

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: