diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-06 10:13:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-06 10:13:21 +0300 |
| commit | cbdf62ae907ad42ceb7a65e070b821bb45e07be9 (patch) | |
| tree | 8dbd497ff1b73c2595edf8f1de81d33ae0aededc | |
| parent | d172df9913722a07fb70abe50c88cf348fc9530a (diff) | |
| download | mariadb-git-cbdf62ae907ad42ceb7a65e070b821bb45e07be9.tar.gz | |
MDEV-25975 merge fixup
| -rw-r--r-- | storage/innobase/dict/dict0stats_bg.cc | 6 | ||||
| -rw-r--r-- | storage/innobase/fts/fts0opt.cc | 6 | ||||
| -rw-r--r-- | storage/innobase/log/log0log.cc | 5 |
3 files changed, 6 insertions, 11 deletions
diff --git a/storage/innobase/dict/dict0stats_bg.cc b/storage/innobase/dict/dict0stats_bg.cc index d2a72695d4e..4968612e964 100644 --- a/storage/innobase/dict/dict0stats_bg.cc +++ b/storage/innobase/dict/dict0stats_bg.cc @@ -37,11 +37,9 @@ Created Apr 25, 2012 Vasil Dimov # include "wsrep.h" # include "log.h" # include "wsrep_mysqld.h" -extern uint32 wsrep_sst_disable_writes; -# define wsrep_sst_disable_writes \ - my_atomic_load32_explicit(&wsrep_sst_disable_writes, MY_MEMORY_ORDER_RELAXED) +extern Atomic_relaxed<bool> wsrep_sst_disable_writes; #else -# define wsrep_sst_disable_writes false +constexpr bool wsrep_sst_disable_writes= false; #endif #include <vector> diff --git a/storage/innobase/fts/fts0opt.cc b/storage/innobase/fts/fts0opt.cc index ab75968ec91..bb8d9c13d68 100644 --- a/storage/innobase/fts/fts0opt.cc +++ b/storage/innobase/fts/fts0opt.cc @@ -40,11 +40,9 @@ Completed 2011/7/10 Sunny and Jimmy Yang #include "wsrep.h" #ifdef WITH_WSREP -extern uint32 wsrep_sst_disable_writes; -# define wsrep_sst_disable_writes \ - my_atomic_load32_explicit(&wsrep_sst_disable_writes, MY_MEMORY_ORDER_RELAXED) +extern Atomic_relaxed<bool> wsrep_sst_disable_writes; #else -# define wsrep_sst_disable_writes false +constexpr bool wsrep_sst_disable_writes= false; #endif /** The FTS optimize thread's work queue. */ diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index c58df6314e9..bf75b3b7c86 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -1460,14 +1460,13 @@ bool log_checkpoint(bool sync) ut_ad(oldest_lsn >= log_sys.last_checkpoint_lsn); const lsn_t age = oldest_lsn - log_sys.last_checkpoint_lsn; - if (age > SIZE_OF_MLOG_CHECKPOINT - + LOG_BLOCK_HDR_SIZE + LOG_BLOCK_CHECKSUM) { + if (age > SIZE_OF_MLOG_CHECKPOINT + log_sys.framing_size()) { /* Some log has been written since the previous checkpoint. */ } else if (age > SIZE_OF_MLOG_CHECKPOINT && !((log_sys.log.calc_lsn_offset(oldest_lsn) ^ log_sys.log.calc_lsn_offset( log_sys.last_checkpoint_lsn)) - & ~lsn_t(OS_FILE_LOG_BLOCK_SIZE - 1))) { + & ~lsn_t{OS_FILE_LOG_BLOCK_SIZE - 1})) { /* Some log has been written to the same log block. */ } else if (srv_shutdown_state > SRV_SHUTDOWN_INITIATED) { /* MariaDB 10.3 startup expects the redo log file to be |