Merge lp:~laurynas-biveinis/percona-server/bug1390695 into lp:percona-server/5.6
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Laurynas Biveinis | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 694 | ||||
Proposed branch: | lp:~laurynas-biveinis/percona-server/bug1390695 | ||||
Merge into: | lp:percona-server/5.6 | ||||
Diff against target: |
36 lines (+3/-2) 3 files modified
storage/innobase/include/lock0lock.h (+1/-1) storage/innobase/include/trx0rec.h (+1/-1) storage/innobase/lock/lock0lock.cc (+1/-0) |
||||
To merge this branch: | bzr merge lp:~laurynas-biveinis/percona-server/bug1390695 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Review via email: mp+241774@code.launchpad.net |
Description of the change
Fix bug 1390695 (percona 5.6.21-70.0 crash on data import) by fixing
the upstream bug http://
attribute(
The crash in the Percona Server bug is happening because a thr != NULL
check after the btr_cur_
away, while NULL is a legal value for thr there. The cause for this is
the upstream bug: lock_rec_
annotated with attribute(
after returning from the call, the compiler assumes that thr must be
!= NULL.
Fix by correcting the attribute(
lock_rec_
to say that thr must be nonnull.
http://
No new MTR testcase needed: the bug makes the existing ones (e.g. innodb.innodb) fail.