Commit ae62f115 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-26166: non-functional changes

parent eb9a2847
...@@ -1670,7 +1670,7 @@ ulint buf_flush_LRU(ulint max_n) ...@@ -1670,7 +1670,7 @@ ulint buf_flush_LRU(ulint max_n)
if (buf_pool.n_flush_LRU()) if (buf_pool.n_flush_LRU())
return 0; return 0;
log_buffer_flush_to_disk(true); log_buffer_flush_to_disk();
mysql_mutex_lock(&buf_pool.mutex); mysql_mutex_lock(&buf_pool.mutex);
if (buf_pool.n_flush_LRU_) if (buf_pool.n_flush_LRU_)
......
...@@ -803,11 +803,9 @@ void log_write_up_to(lsn_t lsn, bool flush_to_disk, bool rotate_key, ...@@ -803,11 +803,9 @@ void log_write_up_to(lsn_t lsn, bool flush_to_disk, bool rotate_key,
if (flush_to_disk && if (flush_to_disk &&
flush_lock.acquire(lsn, callback) != group_commit_lock::ACQUIRED) flush_lock.acquire(lsn, callback) != group_commit_lock::ACQUIRED)
{
return; 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) group_commit_lock::ACQUIRED)
{ {
mysql_mutex_lock(&log_sys.mutex); 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, ...@@ -821,9 +819,7 @@ void log_write_up_to(lsn_t lsn, bool flush_to_disk, bool rotate_key,
} }
if (!flush_to_disk) if (!flush_to_disk)
{
return; return;
}
/* Flush the highest written lsn.*/ /* Flush the highest written lsn.*/
auto flush_lsn = write_lock.value(); auto flush_lsn = write_lock.value();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment