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
5d7607f3
Commit
5d7607f3
authored
Feb 01, 2017
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: style fixes, sql_join_cache.cc
parent
8246b0ac
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
289 additions
and
294 deletions
+289
-294
mysql-test/r/join_cache.result
mysql-test/r/join_cache.result
+2
-2
mysql-test/t/join_cache.test
mysql-test/t/join_cache.test
+2
-2
sql/sql_join_cache.cc
sql/sql_join_cache.cc
+279
-285
sql/sql_select.cc
sql/sql_select.cc
+6
-5
No files found.
mysql-test/r/join_cache.result
View file @
5d7607f3
...
...
@@ -5609,8 +5609,8 @@ set join_cache_level = default;
set optimizer_switch=@tmp_optimizer_switch;
DROP TABLE t1,t2,t3;
#
#
Bug #925985:
LEFT JOIN with optimize_join_buffer_size=off +
#
join_buffer_size > join_buffer_space_limit
#
lp:925985
LEFT JOIN with optimize_join_buffer_size=off +
# join_buffer_size > join_buffer_space_limit
#
CREATE TABLE t1 (a int);
INSERT INTO t1 VALUES (5), (3);
...
...
mysql-test/t/join_cache.test
View file @
5d7607f3
...
...
@@ -3587,8 +3587,8 @@ set optimizer_switch=@tmp_optimizer_switch;
DROP
TABLE
t1
,
t2
,
t3
;
--
echo
#
--
echo
#
Bug #925985:
LEFT JOIN with optimize_join_buffer_size=off +
--
echo
#
join_buffer_size > join_buffer_space_limit
--
echo
#
lp:925985
LEFT JOIN with optimize_join_buffer_size=off +
--
echo
# join_buffer_size > join_buffer_space_limit
--
echo
#
CREATE
TABLE
t1
(
a
int
);
...
...
sql/sql_join_cache.cc
View file @
5d7607f3
This diff is collapsed.
Click to expand it.
sql/sql_select.cc
View file @
5d7607f3
...
...
@@ -10752,6 +10752,7 @@ uint check_join_cache_usage(JOIN_TAB *tab,
uint
bufsz
=
4096
;
JOIN_CACHE
*
prev_cache
=
0
;
JOIN
*
join
=
tab
->
join
;
MEM_ROOT
*
root
=
join
->
thd
->
mem_root
;
uint
cache_level
=
tab
->
used_join_cache_level
;
bool
force_unlinked_cache
=
!
(
join
->
allowed_join_cache_types
&
JOIN_CACHE_INCREMENTAL_BIT
);
...
...
@@ -10871,7 +10872,7 @@ uint check_join_cache_usage(JOIN_TAB *tab,
case
JT_ALL
:
if
(
cache_level
==
1
)
prev_cache
=
0
;
if
((
tab
->
cache
=
new
JOIN_CACHE_BNL
(
join
,
tab
,
prev_cache
))
&&
if
((
tab
->
cache
=
new
(
root
)
JOIN_CACHE_BNL
(
join
,
tab
,
prev_cache
))
&&
!
tab
->
cache
->
init
(
options
&
SELECT_DESCRIBE
))
{
tab
->
icp_other_tables_ok
=
FALSE
;
...
...
@@ -10906,7 +10907,7 @@ uint check_join_cache_usage(JOIN_TAB *tab,
goto
no_join_cache
;
if
(
cache_level
==
3
)
prev_cache
=
0
;
if
((
tab
->
cache
=
new
JOIN_CACHE_BNLH
(
join
,
tab
,
prev_cache
))
&&
if
((
tab
->
cache
=
new
(
root
)
JOIN_CACHE_BNLH
(
join
,
tab
,
prev_cache
))
&&
!
tab
->
cache
->
init
(
options
&
SELECT_DESCRIBE
))
{
tab
->
icp_other_tables_ok
=
FALSE
;
...
...
@@ -10927,7 +10928,7 @@ uint check_join_cache_usage(JOIN_TAB *tab,
{
if
(
cache_level
==
5
)
prev_cache
=
0
;
if
((
tab
->
cache
=
new
JOIN_CACHE_BKA
(
join
,
tab
,
flags
,
prev_cache
))
&&
if
((
tab
->
cache
=
new
(
root
)
JOIN_CACHE_BKA
(
join
,
tab
,
flags
,
prev_cache
))
&&
!
tab
->
cache
->
init
(
options
&
SELECT_DESCRIBE
))
return
(
6
-
MY_TEST
(
!
prev_cache
));
goto
no_join_cache
;
...
...
@@ -10936,10 +10937,10 @@ uint check_join_cache_usage(JOIN_TAB *tab,
{
if
(
cache_level
==
7
)
prev_cache
=
0
;
if
((
tab
->
cache
=
new
JOIN_CACHE_BKAH
(
join
,
tab
,
flags
,
prev_cache
))
&&
if
((
tab
->
cache
=
new
(
root
)
JOIN_CACHE_BKAH
(
join
,
tab
,
flags
,
prev_cache
))
&&
!
tab
->
cache
->
init
(
options
&
SELECT_DESCRIBE
))
{
tab
->
idx_cond_fact_out
=
FALSE
;
tab
->
idx_cond_fact_out
=
FALSE
;
return
(
8
-
MY_TEST
(
!
prev_cache
));
}
goto
no_join_cache
;
...
...
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