mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge work:/home/bk/mysql-4.0

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


Docs/manual.texi:
  Auto merged
This commit is contained in:
unknown 2002-04-18 18:51:01 +00:00
commit 8a20bc123b
4 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Docs/manual.texi
View file

@ -48933,6 +48933,9 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
@itemize @bullet
@item
Fixed bug in boolean fulltext search, that caused MySQL to ignore queries of
@code{ft_min_word_len} characters.
@item
Boolean fulltext search now supports "phrase searches".
@item
New configure option @code{--without-query-cache}.

2
myisam/ft_boolean_search.c
View file

@ -256,7 +256,7 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query,
/* hack: instead of init_queue, we'll use reinit queue to be able
* to alloc queue with alloc_root()
*/
res=ftb->queue.max_elements=query_len/(ft_min_word_len+1);
res=ftb->queue.max_elements=1+query_len/(ft_min_word_len+1);
ftb->queue.root=(byte **)alloc_root(&ftb->mem_root, (res+1)*sizeof(void*));
reinit_queue(& ftb->queue, res, 0, 0,
(int (*)(void*,byte*,byte*))FTB_WORD_cmp, ftb);

3
mysql-test/r/fulltext.result
View file

@ -156,6 +156,9 @@ KEY ind5 (title),
FULLTEXT KEY FT1 (title)
) TYPE=MyISAM;
insert into t1 (title) values ('this is a test');
select * from t1 where match title against ('test' in boolean mode);
id title
1 this is a test
update t1 set title='this is A test' where id=1;
check table t1;
Table Op Msg_type Msg_text

3
mysql-test/t/fulltext.test
View file

@ -118,7 +118,7 @@ select * from t2,t3 where MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');
drop table t1,t2,t3;
#
# two more bugtests
# three more bugtests
#
CREATE TABLE t1 (
@ -130,6 +130,7 @@ CREATE TABLE t1 (
) TYPE=MyISAM;
insert into t1 (title) values ('this is a test');
select * from t1 where match title against ('test' in boolean mode);
update t1 set title='this is A test' where id=1;
check table t1;
update t1 set title='this test once revealed a bug' where id=1;