Browse Source

MDEV-26166: non-functional changes

bb-10.6-MDEV-26209
Marko Mäkelä 4 years ago
parent
commit
ae62f115be
  1. 2
      storage/innobase/buf/buf0flu.cc
  2. 8
      storage/innobase/log/log0log.cc

2
storage/innobase/buf/buf0flu.cc

@ -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_)

8
storage/innobase/log/log0log.cc

@ -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();

Loading…
Cancel
Save