diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-20 10:55:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-20 10:55:03 +0300 |
| commit | ae62f115beea8cb7c532ef1a72c359548316df9c (patch) | |
| tree | 051bcf3929e33bdd9a118fe48bf875a5445abda6 | |
| parent | eb9a28478f88a29814779451e8cc91b8a5659446 (diff) | |
| download | mariadb-git-ae62f115beea8cb7c532ef1a72c359548316df9c.tar.gz | |
MDEV-26166: non-functional changes
| -rw-r--r-- | storage/innobase/buf/buf0flu.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/log/log0log.cc | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc index 94c62a304f9..7f09e607c56 100644 --- a/storage/innobase/buf/buf0flu.cc +++ b/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_) diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index 1c0a617191e..f0dc7852c15 100644 --- a/storage/innobase/log/log0log.cc +++ b/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(); |