Merge lp:~percona-dev/percona-server/5.1-bug814404 into lp:percona-server/5.1

Proposed by Yasufumi Kinoshita
Status: Merged
Approved by: Vadim Tkachenko
Approved revision: no longer in the source branch.
Merged at revision: 288
Proposed branch: lp:~percona-dev/percona-server/5.1-bug814404
Merge into: lp:percona-server/5.1
Diff against target: 20 lines (+5/-5)
1 file modified
innodb_pass_corrupt_table.patch (+5/-5)
To merge this branch: bzr merge lp:~percona-dev/percona-server/5.1-bug814404
Reviewer Review Type Date Requested Status
Vadim Tkachenko Approve
Stewart Smith Pending
Review via email: mp+68772@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vadim Tkachenko (vadim-tk) wrote :

Approved based on discussion for 5.5 merge

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'innodb_pass_corrupt_table.patch'
2--- innodb_pass_corrupt_table.patch 2011-06-29 08:37:20 +0000
3+++ innodb_pass_corrupt_table.patch 2011-07-22 02:59:55 +0000
4@@ -802,11 +802,11 @@
5 + DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
6 + }
7 +
8-+ if (share->ib_table) {
9-+ ut_a(share->ib_table == ib_table);
10-+ } else {
11-+ share->ib_table = ib_table;
12-+ }
13++ share->ib_table = ib_table;
14++
15++
16++
17++
18 +
19 if (NULL == ib_table) {
20 if (is_part && retries < 10) {

Subscribers

People subscribed via source and target branches