1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove set-but-not-used log_sys.log.state

Browse Source
This commit is contained in:
Marko Mäkelä 2018-08-09 12:11:47 +03:00
parent 482d4da0a7
commit 340c8a2a32
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/innobase/include/log0log.h
View File

@ -495,14 +495,6 @@ Stored in LOG_HEADER_FORMAT. */
header */ header */
#define LOG_FILE_HDR_SIZE (4 * OS_FILE_LOG_BLOCK_SIZE) #define LOG_FILE_HDR_SIZE (4 * OS_FILE_LOG_BLOCK_SIZE)
/** The state of a log group */
enum log_group_state_t {
/** No corruption detected */
LOG_GROUP_OK,
/** Corrupted */
LOG_GROUP_CORRUPTED
};
typedef ib_mutex_t LogSysMutex; typedef ib_mutex_t LogSysMutex;
typedef ib_mutex_t FlushOrderMutex; typedef ib_mutex_t FlushOrderMutex;
@ -560,8 +552,6 @@ struct log_t{
ulint format; ulint format;
/** individual log file size in bytes, including the header */ /** individual log file size in bytes, including the header */
lsn_t file_size; lsn_t file_size;
/** corruption status */
log_group_state_t state;
/** lsn used to fix coordinates within the log group */ /** lsn used to fix coordinates within the log group */
lsn_t lsn; lsn_t lsn;
/** the byte offset of the above lsn */ /** the byte offset of the above lsn */

1
storage/innobase/log/log0log.cc
View File

@ -671,7 +671,6 @@ void log_t::files::create(ulint n_files)
? LOG_HEADER_FORMAT_CURRENT | LOG_HEADER_FORMAT_ENCRYPTED ? LOG_HEADER_FORMAT_CURRENT | LOG_HEADER_FORMAT_ENCRYPTED
: LOG_HEADER_FORMAT_CURRENT; : LOG_HEADER_FORMAT_CURRENT;
file_size= srv_log_file_size; file_size= srv_log_file_size;
state= LOG_GROUP_OK;
lsn= LOG_START_LSN; lsn= LOG_START_LSN;
lsn_offset= LOG_FILE_HDR_SIZE; lsn_offset= LOG_FILE_HDR_SIZE;

5
storage/innobase/log/log0recv.cc
View File

@ -834,8 +834,6 @@ recv_find_max_checkpoint_0(ulint* max_field)
*max_field = field; *max_field = field;
max_no = checkpoint_no; max_no = checkpoint_no;
log_sys.log.state = LOG_GROUP_OK;
log_sys.log.lsn = mach_read_from_8( log_sys.log.lsn = mach_read_from_8(
buf + LOG_CHECKPOINT_LSN); buf + LOG_CHECKPOINT_LSN);
log_sys.log.lsn_offset = static_cast<ib_uint64_t>( log_sys.log.lsn_offset = static_cast<ib_uint64_t>(
@ -930,8 +928,6 @@ recv_find_max_checkpoint(ulint* max_field)
buf = log_sys.checkpoint_buf; buf = log_sys.checkpoint_buf;
log_sys.log.state = LOG_GROUP_CORRUPTED;
log_header_read(0); log_header_read(0);
/* Check the header page checksum. There was no /* Check the header page checksum. There was no
checksum in the first redo log format (version 0). */ checksum in the first redo log format (version 0). */
@ -998,7 +994,6 @@ recv_find_max_checkpoint(ulint* max_field)
if (checkpoint_no >= max_no) { if (checkpoint_no >= max_no) {
*max_field = field; *max_field = field;
max_no = checkpoint_no; max_no = checkpoint_no;
log_sys.log.state = LOG_GROUP_OK;
log_sys.log.lsn = mach_read_from_8( log_sys.log.lsn = mach_read_from_8(
buf + LOG_CHECKPOINT_LSN); buf + LOG_CHECKPOINT_LSN);
log_sys.log.lsn_offset = mach_read_from_8( log_sys.log.lsn_offset = mach_read_from_8(