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
71d30d01
Commit
71d30d01
authored
Mar 03, 2021
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.5 into 10.6
parents
1c7d4f8d
4b166ca9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
10 deletions
+25
-10
storage/innobase/btr/btr0sea.cc
storage/innobase/btr/btr0sea.cc
+25
-10
No files found.
storage/innobase/btr/btr0sea.cc
View file @
71d30d01
...
...
@@ -1265,13 +1265,24 @@ void btr_search_drop_page_hash_index(buf_block_t* block)
auto
part
=
btr_search_sys
.
get_part
(
index_id
,
block
->
page
.
id
().
space
());
dict_index_t
*
index
=
block
->
index
;
bool
is_freed
=
index
&&
index
->
freed
();
if
(
is_freed
)
{
part
->
latch
.
wr_lock
(
SRW_LOCK_CALL
);
}
else
{
part
->
latch
.
rd_lock
(
SRW_LOCK_CALL
);
}
assert_block_ahi_valid
(
block
);
dict_index_t
*
index
=
block
->
index
;
if
(
!
index
||
!
btr_search_enabled
)
{
if
(
is_freed
)
{
part
->
latch
.
wr_unlock
();
}
else
{
part
->
latch
.
rd_unlock
();
}
return
;
}
...
...
@@ -1290,7 +1301,9 @@ void btr_search_drop_page_hash_index(buf_block_t* block)
/* NOTE: The AHI fields of block must not be accessed after
releasing search latch, as the index page might only be s-latched! */
if
(
!
is_freed
)
{
part
->
latch
.
rd_unlock
();
}
ut_a
(
n_fields
>
0
||
n_bytes
>
0
);
...
...
@@ -1341,15 +1354,17 @@ void btr_search_drop_page_hash_index(buf_block_t* block)
mem_heap_free
(
heap
);
}
if
(
!
is_freed
)
{
part
->
latch
.
wr_lock
(
SRW_LOCK_CALL
);
if
(
UNIV_UNLIKELY
(
!
block
->
index
))
{
/* Someone else has meanwhile dropped the hash index */
/* Someone else has meanwhile dropped the
hash index */
goto
cleanup
;
}
ut_a
(
block
->
index
==
index
);
}
if
(
block
->
curr_n_fields
!=
n_fields
||
block
->
curr_n_bytes
!=
n_bytes
)
{
...
...
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