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
fb324e3f
Commit
fb324e3f
authored
Sep 05, 2018
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-9137 MariaDB Crash on Query Using Aria Engine
fix for 2-level ft indexes and boolean search in Aria
parent
7438667f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletion
+6
-1
mysql-test/suite/maria/fulltext2.result
mysql-test/suite/maria/fulltext2.result
+3
-0
mysql-test/suite/maria/fulltext2.test
mysql-test/suite/maria/fulltext2.test
+2
-0
storage/maria/ma_ft_boolean_search.c
storage/maria/ma_ft_boolean_search.c
+1
-1
No files found.
mysql-test/suite/maria/fulltext2.result
View file @
fb324e3f
...
...
@@ -18,5 +18,8 @@ test.t1 check status OK
repair table t1;
Table Op Msg_type Msg_text
test.t1 repair status OK
select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
count(*)
1024
insert t1 (a) values ('aaaxxx'),('aaayyy');
drop table t1;
mysql-test/suite/maria/fulltext2.test
View file @
fb324e3f
...
...
@@ -39,6 +39,8 @@ repair table t1;
check
table
t1
;
repair
table
t1
;
select
count
(
*
)
from
t1
where
match
a
against
(
'aaaxxx'
in
boolean
mode
);
# mi_write:
insert
t1
(
a
)
values
(
'aaaxxx'
),(
'aaayyy'
);
...
...
storage/maria/ma_ft_boolean_search.c
View file @
fb324e3f
...
...
@@ -457,7 +457,7 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
*/
ftbw
->
off
=
off
;
ftbw
->
key_root
=
info
->
cur_row
.
lastpos
;
ftbw
->
keyinfo
=&
info
->
s
->
ft2_keyinfo
;
ftbw
->
keyinfo
=
info
->
last_key
.
keyinfo
=
&
info
->
s
->
ft2_keyinfo
;
r
=
_ma_search_first
(
info
,
ftbw
->
keyinfo
,
ftbw
->
key_root
);
DBUG_ASSERT
(
r
==
0
);
/* found something */
memcpy
(
lastkey_buf
+
off
,
info
->
last_key
.
data
,
...
...
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