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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
ac9fea61
Commit
ac9fea61
authored
Nov 02, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge stella.local:/home2/mydev/mysql-4.1-ateam
into stella.local:/home2/mydev/mysql-4.1-axmrg
parents
6f97c229
b698b6fd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
myisam/ft_boolean_search.c
myisam/ft_boolean_search.c
+2
-1
mysql-test/r/fulltext.result
mysql-test/r/fulltext.result
+6
-0
mysql-test/t/fulltext.test
mysql-test/t/fulltext.test
+8
-0
No files found.
myisam/ft_boolean_search.c
View file @
ac9fea61
...
@@ -446,7 +446,8 @@ static int _ftb_strstr(const byte *s0, const byte *e0,
...
@@ -446,7 +446,8 @@ static int _ftb_strstr(const byte *s0, const byte *e0,
{
{
if
(
cs
->
coll
->
instr
(
cs
,
p0
,
e0
-
p0
,
s1
,
e1
-
s1
,
m
,
2
)
!=
2
)
if
(
cs
->
coll
->
instr
(
cs
,
p0
,
e0
-
p0
,
s1
,
e1
-
s1
,
m
,
2
)
!=
2
)
return
(
0
);
return
(
0
);
if
((
!
s_after
||
p0
+
m
[
1
].
beg
==
s0
||
!
true_word_char
(
cs
,
p0
[
m
[
1
].
beg
-
1
]))
&&
if
((
!
s_after
||
p0
+
m
[
1
].
beg
==
s0
||
!
true_word_char
(
cs
,
p0
[(
int
)
m
[
1
].
beg
-
1
]))
&&
(
!
e_before
||
p0
+
m
[
1
].
end
==
e0
||
!
true_word_char
(
cs
,
p0
[
m
[
1
].
end
])))
(
!
e_before
||
p0
+
m
[
1
].
end
==
e0
||
!
true_word_char
(
cs
,
p0
[
m
[
1
].
end
])))
return
(
1
);
return
(
1
);
p0
+=
m
[
1
].
beg
;
p0
+=
m
[
1
].
beg
;
...
...
mysql-test/r/fulltext.result
View file @
ac9fea61
...
@@ -454,3 +454,9 @@ ALTER TABLE t1 DISABLE KEYS;
...
@@ -454,3 +454,9 @@ ALTER TABLE t1 DISABLE KEYS;
SELECT * FROM t1 WHERE MATCH(a) AGAINST('test');
SELECT * FROM t1 WHERE MATCH(a) AGAINST('test');
ERROR HY000: Can't find FULLTEXT index matching the column list
ERROR HY000: Can't find FULLTEXT index matching the column list
DROP TABLE t1;
DROP TABLE t1;
CREATE TABLE t1(a TEXT);
INSERT INTO t1 VALUES(' aaaaa aaaa');
SELECT * FROM t1 WHERE MATCH(a) AGAINST ('"aaaa"' IN BOOLEAN MODE);
a
aaaaa aaaa
DROP TABLE t1;
mysql-test/t/fulltext.test
View file @
ac9fea61
...
@@ -379,4 +379,12 @@ ALTER TABLE t1 DISABLE KEYS;
...
@@ -379,4 +379,12 @@ ALTER TABLE t1 DISABLE KEYS;
SELECT
*
FROM
t1
WHERE
MATCH
(
a
)
AGAINST
(
'test'
);
SELECT
*
FROM
t1
WHERE
MATCH
(
a
)
AGAINST
(
'test'
);
DROP
TABLE
t1
;
DROP
TABLE
t1
;
#
# BUG#11392 - fulltext search bug
#
CREATE
TABLE
t1
(
a
TEXT
);
INSERT
INTO
t1
VALUES
(
' aaaaa aaaa'
);
SELECT
*
FROM
t1
WHERE
MATCH
(
a
)
AGAINST
(
'"aaaa"'
IN
BOOLEAN
MODE
);
DROP
TABLE
t1
;
# End of 4.1 tests
# End of 4.1 tests
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