summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--innobase/buf/buf0buf.c1
-rw-r--r--innobase/log/log0log.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
index f485088a5b7..acf56ac4ddf 100644
--- a/innobase/buf/buf0buf.c
+++ b/innobase/buf/buf0buf.c
@@ -359,6 +359,7 @@ buf_pool_create(
for (i = BUF_FLUSH_LRU; i <= BUF_FLUSH_LIST; i++) {
buf_pool->n_flush[i] = 0;
+ buf_pool->init_flush[i] = FALSE;
buf_pool->no_flush[i] = os_event_create(NULL);
}
diff --git a/innobase/log/log0log.c b/innobase/log/log0log.c
index 351ea7f2fd5..beac63535ab 100644
--- a/innobase/log/log0log.c
+++ b/innobase/log/log0log.c
@@ -569,7 +569,7 @@ log_init(void)
ut_a(LOG_BUFFER_SIZE >= 4 * UNIV_PAGE_SIZE);
buf = ut_malloc(LOG_BUFFER_SIZE + OS_FILE_LOG_BLOCK_SIZE);
- log_sys->buf = ut_align(buf, OS_FILE_LOG_BLOCK_SIZE);
+ log_sys->buf = ut_align(buf, OS_FILE_LOG_BLOCK_SIZE);
log_sys->buf_size = LOG_BUFFER_SIZE;
log_sys->max_buf_free = log_sys->buf_size / LOG_BUF_FLUSH_RATIO
@@ -613,6 +613,7 @@ log_init(void)
log_sys->archiving_state = LOG_ARCH_ON;
log_sys->archived_lsn = log_sys->lsn;
+ log_sys->next_archived_lsn = ut_dulint_zero;
log_sys->n_pending_archive_ios = 0;