diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-01 10:00:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-01 10:00:46 +0300 |
| commit | 609e8e38bb0e5c80a80c77c451b6e519f9aeb386 (patch) | |
| tree | a87d056fb240b741a62d24e3dbefe7baab495b44 | |
| parent | 1d41e9df4ae2de1a0fa6826f6b61310a9a2942ec (diff) | |
| parent | 7f75acc05c54bb4a2ffd0c38c7171e27c271bdb2 (diff) | |
| download | mariadb-git-609e8e38bb0e5c80a80c77c451b6e519f9aeb386.tar.gz | |
Merge 10.5 into 10.6
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index b0c4ad40b50..ba13cc15fb5 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -4270,6 +4270,7 @@ void log_flush_notify(lsn_t flush_lsn) if (auto pending= log_requests.start.load(std::memory_order_acquire)) { mysql_mutex_lock(&log_requests.mutex); + pending= log_requests.start.load(std::memory_order_relaxed); log_flush_notify_and_unlock(pending, flush_lsn); } } |