summaryrefslogtreecommitdiff
path: root/storage/innobase
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-09-07 12:08:34 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-09-07 12:08:34 +0300
commit112d721a74c1f9dcf3321006418fd4abc2884751 (patch)
tree40fc802ff2b7e382e16e510cda2109f62bdd68b3 /storage/innobase
parent7008d4616421fdf73d109ed297def27fa4679da4 (diff)
parentd861822c4f5c05dc7a0baa470212c823fc36fe4c (diff)
downloadmariadb-git-112d721a74c1f9dcf3321006418fd4abc2884751.tar.gz
Merge 10.0 into 10.1
Diffstat (limited to 'storage/innobase')
-rw-r--r--storage/innobase/log/log0recv.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
index 040022add99..6e6d8aae25e 100644
--- a/storage/innobase/log/log0recv.cc
+++ b/storage/innobase/log/log0recv.cc
@@ -3461,6 +3461,7 @@ recv_reset_logs(
log_sys->archived_lsn = log_sys->lsn;
#endif /* UNIV_LOG_ARCHIVE */
+ memset(log_sys->buf, 0, log_sys->buf_size);
log_block_init(log_sys->buf, log_sys->lsn);
log_block_set_first_rec_group(log_sys->buf, LOG_BLOCK_HDR_SIZE);