Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
5f2d79c5
Commit
5f2d79c5
authored
22 years ago
by
serg@serg.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents
5f5cc579
2e6b3c26
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
2 deletions
+9
-2
Docs/manual.texi
Docs/manual.texi
+3
-0
myisam/ft_boolean_search.c
myisam/ft_boolean_search.c
+1
-1
mysql-test/r/fulltext.result
mysql-test/r/fulltext.result
+3
-0
mysql-test/t/fulltext.test
mysql-test/t/fulltext.test
+2
-1
No files found.
Docs/manual.texi
View file @
5f2d79c5
...
@@ -48933,6 +48933,9 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
...
@@ -48933,6 +48933,9 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
@itemize @bullet
@itemize @bullet
@item
@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".
Boolean fulltext search now supports "phrase searches".
@item
@item
New configure option @code{--without-query-cache}.
New configure option @code{--without-query-cache}.
This diff is collapsed.
Click to expand it.
myisam/ft_boolean_search.c
View file @
5f2d79c5
...
@@ -256,7 +256,7 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query,
...
@@ -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
/* hack: instead of init_queue, we'll use reinit queue to be able
* to alloc queue with alloc_root()
* 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
*
));
ftb
->
queue
.
root
=
(
byte
**
)
alloc_root
(
&
ftb
->
mem_root
,
(
res
+
1
)
*
sizeof
(
void
*
));
reinit_queue
(
&
ftb
->
queue
,
res
,
0
,
0
,
reinit_queue
(
&
ftb
->
queue
,
res
,
0
,
0
,
(
int
(
*
)(
void
*
,
byte
*
,
byte
*
))
FTB_WORD_cmp
,
ftb
);
(
int
(
*
)(
void
*
,
byte
*
,
byte
*
))
FTB_WORD_cmp
,
ftb
);
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/fulltext.result
View file @
5f2d79c5
...
@@ -156,6 +156,9 @@ KEY ind5 (title),
...
@@ -156,6 +156,9 @@ KEY ind5 (title),
FULLTEXT KEY FT1 (title)
FULLTEXT KEY FT1 (title)
) TYPE=MyISAM;
) TYPE=MyISAM;
insert into t1 (title) values ('this is a test');
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;
update t1 set title='this is A test' where id=1;
check table t1;
check table t1;
Table Op Msg_type Msg_text
Table Op Msg_type Msg_text
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/fulltext.test
View file @
5f2d79c5
...
@@ -118,7 +118,7 @@ select * from t2,t3 where MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');
...
@@ -118,7 +118,7 @@ select * from t2,t3 where MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');
drop
table
t1
,
t2
,
t3
;
drop
table
t1
,
t2
,
t3
;
#
#
# t
wo
more bugtests
# t
hree
more bugtests
#
#
CREATE
TABLE
t1
(
CREATE
TABLE
t1
(
...
@@ -130,6 +130,7 @@ CREATE TABLE t1 (
...
@@ -130,6 +130,7 @@ CREATE TABLE t1 (
)
TYPE
=
MyISAM
;
)
TYPE
=
MyISAM
;
insert
into
t1
(
title
)
values
(
'this is a test'
);
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
;
update
t1
set
title
=
'this is A test'
where
id
=
1
;
check
table
t1
;
check
table
t1
;
update
t1
set
title
=
'this test once revealed a bug'
where
id
=
1
;
update
t1
set
title
=
'this test once revealed a bug'
where
id
=
1
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment