mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-04-02 05:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions1

MDEV-25975 merge fixup

Browse source
This commit is contained in:
Marko Mäkelä 2022-04-06 10:13:21 +03:00
parent d172df9913
commit cbdf62ae90
3 changed files with 6 additions and 11 deletions
storage/innobase
dict
dict0stats_bg.cc
fts
fts0opt.cc
log
log0log.cc

6
storage/innobase/dict/dict0stats_bg.cc
View file

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

6
storage/innobase/fts/fts0opt.cc
View file

@ -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. */

5
storage/innobase/log/log0log.cc
View file

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