Merge 10.1 into 10.2

MariaDB · Sep 7, 2017 · d26fb96 · d26fb96
2 parents 3c45aa5 + 112d721
commit d26fb96
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/mysql-test/include/search_pattern_in_file.inc b/mysql-test/include/search_pattern_in_file.inc
@@ -76,5 +76,6 @@ perl;
     my $res=@matches ? "FOUND " . scalar(@matches) : "NOT FOUND";
     $ENV{SEARCH_FILE} =~ s{^.*?([^/\\]+)$}{$1};
     print "$res /$search_pattern/ in $ENV{SEARCH_FILE}\n";
-    exit $ENV{SEARCH_ABORT} && $res =~ /^$ENV{SEARCH_ABORT}/;
+    die "$ENV{SEARCH_ABORT}\n"
+    if $ENV{SEARCH_ABORT} && $res =~ /^$ENV{SEARCH_ABORT}/;
 EOF
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
@@ -3461,6 +3461,7 @@ recv_reset_logs(
 	log_sys->next_checkpoint_no = 0;
 	log_sys->last_checkpoint_lsn = 0;
 
+	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);
 

diff --git a/storage/xtradb/include/buf0buf.h b/storage/xtradb/include/buf0buf.h
@@ -765,7 +765,7 @@ buf_print(void);
 UNIV_INTERN
 void
 buf_page_print(const byte* read_buf, ulint zip_size)
-	UNIV_COLD MY_ATTRIBUTE((nonnull));
+	UNIV_COLD;
 
 /********************************************************************//**
 Decompress a block.

diff --git a/storage/xtradb/log/log0recv.cc b/storage/xtradb/log/log0recv.cc
@@ -3564,6 +3564,7 @@ recv_reset_logs(
 
 	log_sys->tracked_lsn = log_sys->lsn;
 
+	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);