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
ea04d331
Commit
ea04d331
authored
Apr 02, 2002
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
2f7a8c0f
7d109953
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
myisam/ft_boolean_search.c
myisam/ft_boolean_search.c
+1
-1
sql/sql_select.cc
sql/sql_select.cc
+2
-1
No files found.
myisam/ft_boolean_search.c
View file @
ea04d331
...
@@ -263,7 +263,7 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query,
...
@@ -263,7 +263,7 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query,
_ftb_parse_query
(
ftb
,
&
query
,
query
+
query_len
,
ftbe
,
0
);
_ftb_parse_query
(
ftb
,
&
query
,
query
+
query_len
,
ftbe
,
0
);
ftb
->
list
=
(
FTB_WORD
**
)
alloc_root
(
&
ftb
->
mem_root
,
ftb
->
list
=
(
FTB_WORD
**
)
alloc_root
(
&
ftb
->
mem_root
,
sizeof
(
FTB_WORD
*
)
*
ftb
->
queue
.
elements
);
sizeof
(
FTB_WORD
*
)
*
ftb
->
queue
.
elements
);
memcpy
(
ftb
->
list
,
ftb
->
queue
.
root
,
sizeof
(
FTB_WORD
*
)
*
ftb
->
queue
.
elements
);
memcpy
(
ftb
->
list
,
ftb
->
queue
.
root
+
1
,
sizeof
(
FTB_WORD
*
)
*
ftb
->
queue
.
elements
);
qsort2
(
ftb
->
list
,
ftb
->
queue
.
elements
,
sizeof
(
FTB_WORD
*
),
qsort2
(
ftb
->
list
,
ftb
->
queue
.
elements
,
sizeof
(
FTB_WORD
*
),
(
qsort2_cmp
)
FTB_WORD_cmp_list
,
0
);
(
qsort2_cmp
)
FTB_WORD_cmp_list
,
0
);
if
(
ftb
->
queue
.
elements
<
2
)
ftb
->
with_scan
=
0
;
if
(
ftb
->
queue
.
elements
<
2
)
ftb
->
with_scan
=
0
;
...
...
sql/sql_select.cc
View file @
ea04d331
...
@@ -1114,7 +1114,8 @@ make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds,
...
@@ -1114,7 +1114,8 @@ make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds,
}
while
(
keyuse
->
table
==
table
&&
keyuse
->
key
==
key
);
}
while
(
keyuse
->
table
==
table
&&
keyuse
->
key
==
key
);
if
(
eq_part
==
PREV_BITS
(
uint
,
table
->
key_info
[
key
].
key_parts
)
&&
if
(
eq_part
==
PREV_BITS
(
uint
,
table
->
key_info
[
key
].
key_parts
)
&&
(
table
->
key_info
[
key
].
flags
&
HA_NOSAME
))
(
table
->
key_info
[
key
].
flags
&
HA_NOSAME
)
&&
!
table
->
fulltext_searched
)
{
{
if
(
const_ref
==
eq_part
)
if
(
const_ref
==
eq_part
)
{
// Found everything for ref.
{
// Found everything for ref.
...
...
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