diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-09 12:11:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-09 12:11:47 +0300 |
| commit | 340c8a2a32dcbe0bb9bc88bd0a6bda5d5e76ed02 (patch) | |
| tree | aea81b1f5f0a82205b6fb13c9dc8cc7cfd00b47c | |
| parent | 482d4da0a7a7f76e8ea9026978d49565f57a4192 (diff) | |
| download | mariadb-git-340c8a2a32dcbe0bb9bc88bd0a6bda5d5e76ed02.tar.gz | |
Remove set-but-not-used log_sys.log.state
| -rw-r--r-- | storage/innobase/include/log0log.h | 10 | ||||
| -rw-r--r-- | storage/innobase/log/log0log.cc | 1 | ||||
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 5 |
3 files changed, 0 insertions, 16 deletions
diff --git a/storage/innobase/include/log0log.h b/storage/innobase/include/log0log.h index 046037f9241..fd8295cfe12 100644 --- a/storage/innobase/include/log0log.h +++ b/storage/innobase/include/log0log.h @@ -495,14 +495,6 @@ Stored in LOG_HEADER_FORMAT. */ header */ #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 FlushOrderMutex; @@ -560,8 +552,6 @@ struct log_t{ ulint format; /** individual log file size in bytes, including the header */ lsn_t file_size; - /** corruption status */ - log_group_state_t state; /** lsn used to fix coordinates within the log group */ lsn_t lsn; /** the byte offset of the above lsn */ diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index b099e50cd9e..09ed2f16d7d 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -671,7 +671,6 @@ void log_t::files::create(ulint n_files) ? LOG_HEADER_FORMAT_CURRENT | LOG_HEADER_FORMAT_ENCRYPTED : LOG_HEADER_FORMAT_CURRENT; file_size= srv_log_file_size; - state= LOG_GROUP_OK; lsn= LOG_START_LSN; lsn_offset= LOG_FILE_HDR_SIZE; diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index 1f1829370c3..fdfdbfe3687 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -834,8 +834,6 @@ recv_find_max_checkpoint_0(ulint* max_field) *max_field = field; max_no = checkpoint_no; - log_sys.log.state = LOG_GROUP_OK; - log_sys.log.lsn = mach_read_from_8( buf + LOG_CHECKPOINT_LSN); 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; - log_sys.log.state = LOG_GROUP_CORRUPTED; - log_header_read(0); /* Check the header page checksum. There was no 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) { *max_field = field; max_no = checkpoint_no; - log_sys.log.state = LOG_GROUP_OK; log_sys.log.lsn = mach_read_from_8( buf + LOG_CHECKPOINT_LSN); log_sys.log.lsn_offset = mach_read_from_8( |