database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2017-09-07 12:12:31 +03:00
parent 3c45aa5895 112d721a74
commit d26fb96a9f
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/include/search_pattern_in_file.inc
View File

@ -76,5 +76,6 @@ perl;
my $res=@matches ? "FOUND " . scalar(@matches) : "NOT FOUND"; my $res=@matches ? "FOUND " . scalar(@matches) : "NOT FOUND";
$ENV{SEARCH_FILE} =~ s{^.*?([^/\\]+)$}{$1}; $ENV{SEARCH_FILE} =~ s{^.*?([^/\\]+)$}{$1};
print "$res /$search_pattern/ in $ENV{SEARCH_FILE}\n"; 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 EOF

1
storage/innobase/log/log0recv.cc
View File

@ -3461,6 +3461,7 @@ recv_reset_logs(
log_sys->next_checkpoint_no = 0; log_sys->next_checkpoint_no = 0;
log_sys->last_checkpoint_lsn = 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_init(log_sys->buf, log_sys->lsn);
log_block_set_first_rec_group(log_sys->buf, LOG_BLOCK_HDR_SIZE); log_block_set_first_rec_group(log_sys->buf, LOG_BLOCK_HDR_SIZE);

2
storage/xtradb/include/buf0buf.h
View File

@ -765,7 +765,7 @@ buf_print(void);
UNIV_INTERN UNIV_INTERN
void void
buf_page_print(const byte* read_buf, ulint zip_size) buf_page_print(const byte* read_buf, ulint zip_size)
UNIV_COLD MY_ATTRIBUTE((nonnull)); UNIV_COLD;
/********************************************************************//** /********************************************************************//**
Decompress a block. Decompress a block.

1
storage/xtradb/log/log0recv.cc
View File

@ -3564,6 +3564,7 @@ recv_reset_logs(
log_sys->tracked_lsn = log_sys->lsn; 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_init(log_sys->buf, log_sys->lsn);
log_block_set_first_rec_group(log_sys->buf, LOG_BLOCK_HDR_SIZE); log_block_set_first_rec_group(log_sys->buf, LOG_BLOCK_HDR_SIZE);