diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-08-02 12:15:58 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-08-02 12:15:58 +0300 |
| commit | b278c02e18dbcb0e8920192fa5ac3da83e397826 (patch) | |
| tree | e8b38f5919338929a769b184d500b8bf3398e991 /storage/xtradb/log | |
| parent | 60c9485a8e5ebf410d9fa60caa7937f3fe3ca9b8 (diff) | |
| parent | 04ae1207edec4cac80d7206377ae22a8447aa08f (diff) | |
| download | mariadb-git-b278c02e18dbcb0e8920192fa5ac3da83e397826.tar.gz | |
Merge branch 'merge-xtradb-5.6' into 10.0
Diffstat (limited to 'storage/xtradb/log')
| -rw-r--r-- | storage/xtradb/log/log0log.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/xtradb/log/log0log.cc b/storage/xtradb/log/log0log.cc index 211cde3cc7a..a3b08eb6730 100644 --- a/storage/xtradb/log/log0log.cc +++ b/storage/xtradb/log/log0log.cc @@ -3577,6 +3577,7 @@ loop: before proceeding further. */ srv_shutdown_state = SRV_SHUTDOWN_FLUSH_PHASE; count = 0; + os_rmb; while (buf_page_cleaner_is_active || buf_lru_manager_is_active) { if (srv_print_verbose_log && count == 0) { ib_logf(IB_LOG_LEVEL_INFO, @@ -3588,6 +3589,7 @@ loop: if (count > 600) { count = 0; } + os_rmb; } mutex_enter(&log_sys->mutex); |