Merge lp:~akopytov/percona-server/bug1250148 into lp:percona-server/5.6

Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: 495
Merged at revision: 495
Proposed branch: lp:~akopytov/percona-server/bug1250148
Merge into: lp:percona-server/5.6
Diff against target: 27 lines (+5/-5)
1 file modified
Percona-Server/storage/innobase/log/log0recv.cc (+5/-5)
To merge this branch: bzr merge lp:~akopytov/percona-server/bug1250148
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+194810@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

Self-approving, trivial change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/storage/innobase/log/log0recv.cc'
2--- Percona-Server/storage/innobase/log/log0recv.cc 2013-10-23 08:48:28 +0000
3+++ Percona-Server/storage/innobase/log/log0recv.cc 2013-11-12 08:40:11 +0000
4@@ -913,9 +913,9 @@
5 return(TRUE);
6 }
7
8- if (srv_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_STRICT_CRC32 ||
9- srv_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_STRICT_INNODB ||
10- srv_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_STRICT_NONE) {
11+ if (srv_log_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_STRICT_CRC32 ||
12+ srv_log_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_STRICT_INNODB ||
13+ srv_log_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_STRICT_NONE) {
14
15 const char* algo = NULL;
16
17@@ -958,8 +958,8 @@
18 "so we intentionally assert here.");
19 }
20
21- ut_ad(srv_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_CRC32 ||
22- srv_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_INNODB);
23+ ut_ad(srv_log_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_CRC32 ||
24+ srv_log_checksum_algorithm == SRV_CHECKSUM_ALGORITHM_INNODB);
25
26 if (block_checksum == LOG_NO_CHECKSUM_MAGIC ||
27 block_checksum == log_block_calc_checksum_crc32(block) ||

Subscribers

People subscribed via source and target branches