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
ae62f115
Commit
ae62f115
authored
Jul 20, 2021
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-26166: non-functional changes
parent
eb9a2847
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
7 deletions
+3
-7
storage/innobase/buf/buf0flu.cc
storage/innobase/buf/buf0flu.cc
+1
-1
storage/innobase/log/log0log.cc
storage/innobase/log/log0log.cc
+2
-6
No files found.
storage/innobase/buf/buf0flu.cc
View file @
ae62f115
...
...
@@ -1670,7 +1670,7 @@ ulint buf_flush_LRU(ulint max_n)
if
(
buf_pool
.
n_flush_LRU
())
return
0
;
log_buffer_flush_to_disk
(
true
);
log_buffer_flush_to_disk
();
mysql_mutex_lock
(
&
buf_pool
.
mutex
);
if
(
buf_pool
.
n_flush_LRU_
)
...
...
storage/innobase/log/log0log.cc
View file @
ae62f115
...
...
@@ -802,12 +802,10 @@ void log_write_up_to(lsn_t lsn, bool flush_to_disk, bool rotate_key,
}
if
(
flush_to_disk
&&
flush_lock
.
acquire
(
lsn
,
callback
)
!=
group_commit_lock
::
ACQUIRED
)
{
flush_lock
.
acquire
(
lsn
,
callback
)
!=
group_commit_lock
::
ACQUIRED
)
return
;
}
if
(
write_lock
.
acquire
(
lsn
,
flush_to_disk
?
0
:
callback
)
==
if
(
write_lock
.
acquire
(
lsn
,
flush_to_disk
?
nullptr
:
callback
)
==
group_commit_lock
::
ACQUIRED
)
{
mysql_mutex_lock
(
&
log_sys
.
mutex
);
...
...
@@ -821,9 +819,7 @@ void log_write_up_to(lsn_t lsn, bool flush_to_disk, bool rotate_key,
}
if
(
!
flush_to_disk
)
{
return
;
}
/* Flush the highest written lsn.*/
auto
flush_lsn
=
write_lock
.
value
();
...
...
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