Merge 10.2 into 10.3

MariaDB · May 4, 2018 · b20039d · b20039d
2 parents 3b50cd2 + d257c42
commit b20039d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc
@@ -228,6 +228,7 @@ void log_buffer_extend(ulong len)
 
 	log_sys.buf = static_cast<byte*>(
 		ut_malloc_dontdump(srv_log_buffer_size * 2));
+	TRASH_ALLOC(log_sys.buf, srv_log_buffer_size * 2);
 
 	log_sys.first_in_use = true;
 
@@ -609,6 +610,7 @@ void log_t::create()
   ut_ad(srv_log_buffer_size >= 4U << srv_page_size_shift);
 
   buf= static_cast<byte*>(ut_malloc_dontdump(srv_log_buffer_size * 2));
+  TRASH_ALLOC(buf, srv_log_buffer_size * 2);
 
   first_in_use= true;
 
@@ -1069,7 +1071,8 @@ log_write_up_to(
 
 	log_mutex_exit();
 	/* Erase the end of the last log block. */
-	memset(write_buf + end_offset, 0, ~end_offset & OS_FILE_LOG_BLOCK_SIZE);
+	memset(write_buf + end_offset, 0,
+	       ~end_offset & (OS_FILE_LOG_BLOCK_SIZE - 1));
 
 	/* Calculate pad_size if needed. */
 	pad_size = 0;