diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-07 12:12:31 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-07 12:12:31 +0300 |
| commit | d26fb96a9f225e53941fad5feb21abddbbf99a95 (patch) | |
| tree | f8dd1bb2cd21986a48f645a0c576d871319a1cd8 | |
| parent | 3c45aa58950ef5a1906540ed339ba375d640e66d (diff) | |
| parent | 112d721a74c1f9dcf3321006418fd4abc2884751 (diff) | |
| download | mariadb-git-d26fb96a9f225e53941fad5feb21abddbbf99a95.tar.gz | |
Merge 10.1 into 10.2
| -rw-r--r-- | mysql-test/include/search_pattern_in_file.inc | 3 | ||||
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 1 | ||||
| -rw-r--r-- | storage/xtradb/include/buf0buf.h | 2 | ||||
| -rw-r--r-- | storage/xtradb/log/log0recv.cc | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/include/search_pattern_in_file.inc b/mysql-test/include/search_pattern_in_file.inc index 3c5529989bb..21192b55efb 100644 --- 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 index 54af4140f64..8bc8df750e4 100644 --- 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 index cdd535168e9..88ee042e8c3 100644 --- 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 index 0137cb44571..75fc7713c5b 100644 --- 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); |